Skip to content

Commit 0f5b256

Browse files
whaeckwhaeck
committed
Updates following review
1 parent d1e0f7d commit 0f5b256

8 files changed

Lines changed: 34 additions & 33 deletions

‎python/src/PhotoatomicTable.python.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,15 @@ void wrapPhotoatomicTable( python::module& module, python::module& ) {
193193

194194
"NEPR",
195195
&Table::NEPR,
196-
"The EPR data format flag (0 for old format and 1 for EPR data)"
196+
"The EPR data format flag (0 for the old mcplib format, 1 for EPR data from\n"
197+
"2012 and 3 for EPR data from 2014 and above)"
197198
)
198199
.def_property_readonly(
199200

200201
"electron_photon_relaxation_format",
201202
&Table::electronPhotonRelaxationFormat,
202-
"Return the EPR data format flag (0 for old format, 1 for EPR data\n"
203-
"from 2012 and 3 for EPR data from 2014)"
203+
"The EPR data format flag (0 for the old mcplib format, 1 for EPR data from\n"
204+
"2012 and 3 for EPR data from 2014 and above)"
204205
)
205206
.def_property_readonly(
206207

‎python/src/block/PhotoatomicElectronSubshellBlock.python.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ void wrapPhotoatomicElectronSubshellBlock( python::module& module, python::modul
6868
)
6969
.def_property_readonly(
7070

71-
"ENDF",
71+
"ID",
7272
[] ( const Block& self ) -> UnsignedIntRange
73-
{ return self.ENDF(); },
73+
{ return self.ID(); },
7474
"The number of electron shells"
7575
)
7676
.def_property_readonly(

‎python/test/block/Test_ACEtk_PhotoatomicElectronSubshellBlock.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ def verify_chunk( self, chunk ) :
3131
self.assertEqual( 5, chunk.NSSH )
3232
self.assertEqual( 5, chunk.number_electron_subshells )
3333

34-
self.assertEqual( 1, chunk.ENDF[0] )
35-
self.assertEqual( 2, chunk.ENDF[1] )
36-
self.assertEqual( 3, chunk.ENDF[2] )
37-
self.assertEqual( 4, chunk.ENDF[3] )
38-
self.assertEqual( 5, chunk.ENDF[4] )
34+
self.assertEqual( 1, chunk.ID[0] )
35+
self.assertEqual( 2, chunk.ID[1] )
36+
self.assertEqual( 3, chunk.ID[2] )
37+
self.assertEqual( 4, chunk.ID[3] )
38+
self.assertEqual( 5, chunk.ID[4] )
3939
self.assertEqual( 1, chunk.designators[0] )
4040
self.assertEqual( 2, chunk.designators[1] )
4141
self.assertEqual( 3, chunk.designators[2] )

‎src/ACEtk/PhotoatomicTable.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@ class PhotoatomicTable : protected Table {
164164
unsigned int numberElectronShells() const { return this->NSH(); }
165165

166166
/**
167-
* @brief Return the EPR data format flag (0 for old format, 1 for EPR data
168-
* from 2012 and 3 for EPR data from 2014 and above)
167+
* @brief Return the EPR data format flag (0 for the old mcplib format, 1 for
168+
* EPR data from 2012 and 3 for EPR data from 2014 and above)
169169
*/
170170
unsigned int NEPR() const { return this->data().NXS(6); }
171171

172172
/**
173-
* @brief Return the EPR data format flag (0 for old format, 1 for EPR data
174-
* from 2012 and 3 for EPR data from 2014 and above)
173+
* @brief Return the EPR data format flag (0 for the old mcplib format, 1 for
174+
* EPR data from 2012 and 3 for EPR data from 2014 and above)
175175
*/
176176
unsigned int electronPhotonRelaxationFormat() const { return this->NEPR(); }
177177

‎src/ACEtk/PhotoatomicTable/test/PhotoatomicTable.test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ void verifyChunkEprdata12( const PhotoatomicTable& chunk ) {
10801080
CHECK( 1 == chunk.SUBSH()->NSSH() );
10811081
CHECK( 1 == chunk.SUBSH()->numberElectronSubshells() );
10821082

1083-
CHECK( 1 == chunk.SUBSH()->ENDF()[0] );
1083+
CHECK( 1 == chunk.SUBSH()->ID()[0] );
10841084
CHECK( 1 == chunk.SUBSH()->designators()[0] );
10851085

10861086
CHECK( 1 == chunk.SUBSH()->EP()[0] );
@@ -1409,10 +1409,10 @@ void verifyChunkEprdata14( const PhotoatomicTable& chunk ) {
14091409
CHECK( 4 == chunk.SUBSH()->NSSH() );
14101410
CHECK( 4 == chunk.SUBSH()->numberElectronSubshells() );
14111411

1412-
CHECK( 1 == chunk.SUBSH()->ENDF()[0] );
1413-
CHECK( 2 == chunk.SUBSH()->ENDF()[1] );
1414-
CHECK( 3 == chunk.SUBSH()->ENDF()[2] );
1415-
CHECK( 4 == chunk.SUBSH()->ENDF()[3] );
1412+
CHECK( 1 == chunk.SUBSH()->ID()[0] );
1413+
CHECK( 2 == chunk.SUBSH()->ID()[1] );
1414+
CHECK( 3 == chunk.SUBSH()->ID()[2] );
1415+
CHECK( 4 == chunk.SUBSH()->ID()[3] );
14161416
CHECK( 1 == chunk.SUBSH()->designators()[0] );
14171417
CHECK( 2 == chunk.SUBSH()->designators()[1] );
14181418
CHECK( 3 == chunk.SUBSH()->designators()[2] );

‎src/ACEtk/block/PhotoatomicElectronCrossSectionBlock.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace block {
1616
*
1717
* This block is part of the eprdata formats.
1818
*
19-
* The PhotoatomicElectronCrossSectionBlock class contains 5 + NSSH arrays
19+
* The PhotoatomicElectronCrossSectionBlock class contains 5 + NSSH arrays
2020
* of the same length:
2121
* - the energy points
2222
* - the total cross section (sum of the following three arrays)
@@ -26,7 +26,7 @@ namespace block {
2626
* - the total electroionisation cross section (sum of the following NSSH arrays)
2727
* - the electroionisation cross section for each subshell (NSSH arrays)
2828
*
29-
* The size NE of each (the total number of electron energy points) is stored in
29+
* The size NE of each (the total number of electron energy points) is stored in
3030
* NXS(8). The number of subshells NSSH is stored in NXS(7).
3131
*/
3232
class PhotoatomicElectronCrossSectionBlock : protected details::ArrayData {
@@ -95,17 +95,17 @@ class PhotoatomicElectronCrossSectionBlock : protected details::ArrayData {
9595
auto totalElectroionisation() const { return this->darray( 6 ); }
9696

9797
/**
98-
* @brief Return the electroionisation cross section values for a specific
98+
* @brief Return the electroionisation cross section values for a specific
9999
* shell
100100
*
101101
* @param[in] index the electron subshell index (one-based)
102102
*/
103-
auto electroionisation( std::size_t index ) const {
103+
auto electroionisation( std::size_t index ) const {
104104

105105
#ifndef NDEBUG
106106
this->verifyIndex( index );
107107
#endif
108-
return this->darray( 6 + index );
108+
return this->darray( 6 + index );
109109
}
110110

111111
using ArrayData::empty;

‎src/ACEtk/block/PhotoatomicElectronSubshellBlock.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ class PhotoatomicElectronSubshellBlock : protected details::ArrayData {
5050
/**
5151
* @brief Return the ENDF designator for each subshell
5252
*/
53-
auto ENDF() const { return this->iarray( 1 ); }
53+
auto ID() const { return this->iarray( 1 ); }
5454

5555
/**
5656
* @brief Return the ENDF designator for each subshell
5757
*/
58-
auto designators() const { return this->ENDF(); }
58+
auto designators() const { return this->ID(); }
5959

6060
/**
6161
* @brief Return the electron population for each subshell
@@ -78,12 +78,12 @@ class PhotoatomicElectronSubshellBlock : protected details::ArrayData {
7878
auto bindingEnergies() const { return this->BE(); }
7979

8080
/**
81-
* @brief Return the vacancy probabilities for each subshell
81+
* @brief Return the vacancy cumulative probabilities for each subshell
8282
*/
8383
auto CV() const { return this->darray( 4 ); }
8484

8585
/**
86-
* @brief Return the vacancy probabilities for each subshell
86+
* @brief Return the vacancy cumulative probabilities for each subshell
8787
*/
8888
auto vacancyProbabilities() const { return this->CV(); }
8989

‎src/ACEtk/block/PhotoatomicElectronSubshellBlock/test/PhotoatomicElectronSubshellBlock.test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ void verifyChunk( const PhotoatomicElectronSubshellBlock& chunk ) {
9393
CHECK( 5 == chunk.NSSH() );
9494
CHECK( 5 == chunk.numberElectronSubshells() );
9595

96-
CHECK( 1 == chunk.ENDF()[0] );
97-
CHECK( 2 == chunk.ENDF()[1] );
98-
CHECK( 3 == chunk.ENDF()[2] );
99-
CHECK( 4 == chunk.ENDF()[3] );
100-
CHECK( 5 == chunk.ENDF()[4] );
96+
CHECK( 1 == chunk.ID()[0] );
97+
CHECK( 2 == chunk.ID()[1] );
98+
CHECK( 3 == chunk.ID()[2] );
99+
CHECK( 4 == chunk.ID()[3] );
100+
CHECK( 5 == chunk.ID()[4] );
101101
CHECK( 1 == chunk.designators()[0] );
102102
CHECK( 2 == chunk.designators()[1] );
103103
CHECK( 3 == chunk.designators()[2] );

0 commit comments

Comments
 (0)