Skip to content

Commit b1d5bd7

Browse files
whaeckwhaeck
committed
Rename photonuclear table
1 parent 2d06efd commit b1d5bd7

26 files changed

Lines changed: 113 additions & 112 deletions

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,13 @@ if(ACEtk.python)
157157
python/src/block/PhotoatomicElectronShellBlock.python.cpp
158158
python/src/block/PhotoatomicComptonProfile.python.cpp
159159
python/src/block/PhotoatomicComptonProfileBlock.python.cpp
160-
python/src/block/PhotoNuclearPrincipalCrossSectionBlock.python.cpp
161-
python/src/block/PhotoNuclearSecondaryParticleLocatorBlock.python.cpp
160+
python/src/block/PhotonuclearPrincipalCrossSectionBlock.python.cpp
161+
python/src/block/PhotonuclearSecondaryParticleLocatorBlock.python.cpp
162162
python/src/ContinuousEnergyTable.python.cpp
163163
python/src/DosimetryTable.python.cpp
164164
python/src/ThermalScatteringTable.python.cpp
165165
python/src/PhotoatomicTable.python.cpp
166-
python/src/PhotoNuclearTable.python.cpp
166+
python/src/PhotonuclearTable.python.cpp
167167
)
168168

169169
target_link_libraries( ACEtk.python PRIVATE ACEtk )

‎cmake/unit_testing.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ add_subdirectory( src/ACEtk/ContinuousEnergyTable/test )
1414
add_subdirectory( src/ACEtk/DosimetryTable/test )
1515
add_subdirectory( src/ACEtk/ThermalScatteringTable/test )
1616
add_subdirectory( src/ACEtk/PhotoatomicTable/test )
17-
add_subdirectory( src/ACEtk/PhotoNuclearTable/test )
17+
add_subdirectory( src/ACEtk/PhotonuclearTable/test )
1818
add_subdirectory( src/ACEtk/Table/Data/Parse/test )
1919
add_subdirectory( src/ACEtk/Table/Data/test )
2020
add_subdirectory( src/ACEtk/Table/Header/test )
@@ -87,8 +87,8 @@ add_subdirectory( src/ACEtk/block/PhotoatomicHeatingNumbersBlock/test )
8787
add_subdirectory( src/ACEtk/block/PhotoatomicComptonProfile/test )
8888
add_subdirectory( src/ACEtk/block/PhotoatomicComptonProfileBlock/test )
8989
add_subdirectory( src/ACEtk/block/PhotoatomicElectronShellBlock/test )
90-
add_subdirectory( src/ACEtk/block/PhotoNuclearPrincipalCrossSectionBlock/test )
91-
add_subdirectory( src/ACEtk/block/PhotoNuclearSecondaryParticleLocatorBlock/test )
90+
add_subdirectory( src/ACEtk/block/PhotonuclearPrincipalCrossSectionBlock/test )
91+
add_subdirectory( src/ACEtk/block/PhotonuclearSecondaryParticleLocatorBlock/test )
9292
add_subdirectory( src/ACEtk/details/verify/CDF/test )
9393
add_subdirectory( src/ACEtk/details/verify/Positive/test )
9494
add_subdirectory( src/ACEtk/details/verify/Sorted/test )

‎python/src/ACEtk.python.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ namespace block {
9999
void wrapPhotoatomicHeatingNumbersBlock( python::module&, python::module& );
100100
void wrapPhotoatomicElectronShellBlock( python::module&, python::module& );
101101
void wrapPhotoatomicComptonProfileBlock( python::module&, python::module& );
102-
void wrapPhotoNuclearPrincipalCrossSectionBlock( python::module&, python::module& );
103-
void wrapPhotoNuclearSecondaryParticleLocatorBlock( python::module&, python::module& );
102+
void wrapPhotonuclearPrincipalCrossSectionBlock( python::module&, python::module& );
103+
void wrapPhotonuclearSecondaryParticleLocatorBlock( python::module&, python::module& );
104104
}
105105

106106
// declarations - ACE table types
107107
void wrapContinuousEnergyTable( python::module&, python::module& );
108108
void wrapDosimetryTable( python::module&, python::module& );
109109
void wrapThermalScatteringTable( python::module&, python::module& );
110110
void wrapPhotoatomicTable( python::module&, python::module& );
111-
void wrapPhotoNuclearTable( python::module&, python::module& );
111+
void wrapPhotonuclearTable( python::module&, python::module& );
112112

113113
/**
114114
* @brief ACEtk python bindings
@@ -226,13 +226,13 @@ PYBIND11_MODULE( ACEtk, module ) {
226226
block::wrapPhotoatomicHeatingNumbersBlock( module, viewmodule );
227227
block::wrapPhotoatomicElectronShellBlock( module, viewmodule );
228228
block::wrapPhotoatomicComptonProfileBlock( module, viewmodule );
229-
block::wrapPhotoNuclearPrincipalCrossSectionBlock( module, viewmodule );
230-
block::wrapPhotoNuclearSecondaryParticleLocatorBlock( module, viewmodule );
229+
block::wrapPhotonuclearPrincipalCrossSectionBlock( module, viewmodule );
230+
block::wrapPhotonuclearSecondaryParticleLocatorBlock( module, viewmodule );
231231

232232
// wrap ACE table types
233233
wrapContinuousEnergyTable( module, viewmodule );
234234
wrapDosimetryTable( module, viewmodule );
235235
wrapThermalScatteringTable( module, viewmodule );
236236
wrapPhotoatomicTable( module, viewmodule );
237-
wrapPhotoNuclearTable( module, viewmodule );
237+
wrapPhotonuclearTable( module, viewmodule );
238238
}

python/src/PhotoNuclearTable.python.cpp renamed to python/src/PhotonuclearTable.python.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
#include <pybind11/stl.h>
44

55
// local includes
6-
#include "ACEtk/PhotoNuclearTable.hpp"
6+
#include "ACEtk/PhotonuclearTable.hpp"
77
#include "ACEtk/fromFile.hpp"
88
#include "definitions.hpp"
99
#include "views.hpp"
1010

1111
// namespace aliases
1212
namespace python = pybind11;
1313

14-
void wrapPhotoNuclearTable( python::module& module, python::module& ) {
14+
void wrapPhotonuclearTable( python::module& module, python::module& ) {
1515

1616
// type aliases
1717
using Header = njoy::ACEtk::Table::Header;
18-
using Table = njoy::ACEtk::PhotoNuclearTable;
18+
using Table = njoy::ACEtk::PhotonuclearTable;
1919
using ESZU = njoy::ACEtk::block::ESZU;
2020
using MTR = njoy::ACEtk::block::MTR;
2121
using LQR = njoy::ACEtk::block::LQR;
@@ -33,9 +33,9 @@ void wrapPhotoNuclearTable( python::module& module, python::module& ) {
3333
python::class_< Table > table(
3434

3535
module,
36-
"PhotoNuclearTable",
36+
"PhotonuclearTable",
3737
"A continuous energy ACE table\n\n"
38-
"The PhotoNuclearTable class represents the ACE table for the photonuclear data."
38+
"The PhotonuclearTable class represents the ACE table for the photonuclear data."
3939
);
4040

4141
// wrap the table

python/src/block/PhotoNuclearPrincipalCrossSectionBlock.python.cpp renamed to python/src/block/PhotonuclearPrincipalCrossSectionBlock.python.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <pybind11/stl.h>
44

55
// local includes
6-
#include "ACEtk/block/PhotoNuclearPrincipalCrossSectionBlock.hpp"
6+
#include "ACEtk/block/PhotonuclearPrincipalCrossSectionBlock.hpp"
77
#include "views.hpp"
88
#include "definitions.hpp"
99

@@ -12,20 +12,20 @@ namespace python = pybind11;
1212

1313
namespace block {
1414

15-
void wrapPhotoNuclearPrincipalCrossSectionBlock( python::module& module, python::module& ) {
15+
void wrapPhotonuclearPrincipalCrossSectionBlock( python::module& module, python::module& ) {
1616

1717
// type aliases
18-
using Block = njoy::ACEtk::block::PhotoNuclearPrincipalCrossSectionBlock;
18+
using Block = njoy::ACEtk::block::PhotonuclearPrincipalCrossSectionBlock;
1919

2020
// wrap views created by this block
2121

2222
// create the block
2323
python::class_< Block > block(
2424

2525
module,
26-
"PhotoNuclearPrincipalCrossSectionBlock",
26+
"PhotonuclearPrincipalCrossSectionBlock",
2727
"The photoatomic ESZG block with the principal cross sections\n\n"
28-
"The PhotoNuclearPrincipalCrossSectionBlock class contains 3 or 4 arrays of the\n"
28+
"The PhotonuclearPrincipalCrossSectionBlock class contains 3 or 4 arrays of the\n"
2929
"same length (all values are stored as the natural logarithm):\n"
3030
" - the energy points\n"
3131
" - the total cross section\n"

python/src/block/PhotoNuclearSecondaryParticleLocatorBlock.python.cpp renamed to python/src/block/PhotonuclearSecondaryParticleLocatorBlock.python.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <pybind11/stl.h>
44

55
// local includes
6-
#include "ACEtk/block/PhotoNuclearSecondaryParticleLocatorBlock.hpp"
6+
#include "ACEtk/block/PhotonuclearSecondaryParticleLocatorBlock.hpp"
77
#include "views.hpp"
88
#include "definitions.hpp"
99

@@ -12,20 +12,20 @@ namespace python = pybind11;
1212

1313
namespace block {
1414

15-
void wrapPhotoNuclearSecondaryParticleLocatorBlock( python::module& module, python::module& ) {
15+
void wrapPhotonuclearSecondaryParticleLocatorBlock( python::module& module, python::module& ) {
1616

1717
// type aliases
18-
using Block = njoy::ACEtk::block::PhotoNuclearSecondaryParticleLocatorBlock;
18+
using Block = njoy::ACEtk::block::PhotonuclearSecondaryParticleLocatorBlock;
1919

2020
// wrap views created by this block
2121

2222
// create the block
2323
python::class_< Block > block(
2424

2525
module,
26-
"PhotoNuclearSecondaryParticleLocatorBlock",
26+
"PhotonuclearSecondaryParticleLocatorBlock",
2727
"The photonuclear IXSU block with the secondary particle information and locators\n\n"
28-
"The PhotoNuclearSecondaryParticleLocatorBlock class contains a particle type,\n"
28+
"The PhotonuclearSecondaryParticleLocatorBlock class contains a particle type,\n"
2929
"a number of reactions and 10 locators for each secondary particle type.\n\n"
3030
"The number of available available particle types is stored in NXS(5)."
3131
);

python/test/block/Test_ACEtk_PhotoNuclearPrincipalCrossSectionBlock.py renamed to python/test/block/Test_ACEtk_PhotonuclearPrincipalCrossSectionBlock.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# third party imports
55

66
# local imports
7-
from ACEtk import PhotoNuclearPrincipalCrossSectionBlock
7+
from ACEtk import PhotonuclearPrincipalCrossSectionBlock
88

9-
class Test_ACEtk_PhotoNuclearPrincipalCrossSectionBlock( unittest.TestCase ) :
10-
"""Unit test for the PhotoNuclearPrincipalCrossSectionBlock class."""
9+
class Test_ACEtk_PhotonuclearPrincipalCrossSectionBlock( unittest.TestCase ) :
10+
"""Unit test for the PhotonuclearPrincipalCrossSectionBlock class."""
1111

1212
chunk = [ 1.00000000000E+00, 1.50000000000E+00, 2.00000000000E+00, 2.50000000000E+00,
1313
3.00000000000E+00, 3.50000000000E+00, 4.00000000000E+00, 4.50000000000E+00,
@@ -110,7 +110,7 @@ def verify_chunk( self, chunk ) :
110110
self.assertAlmostEqual( self.chunk[index], xss[index] )
111111

112112
# the data is given explicitly
113-
chunk = PhotoNuclearPrincipalCrossSectionBlock(
113+
chunk = PhotonuclearPrincipalCrossSectionBlock(
114114
energies = [ 1.00000000000E+00, 1.50000000000E+00, 2.00000000000E+00, 2.50000000000E+00,
115115
3.00000000000E+00, 3.50000000000E+00, 4.00000000000E+00, 4.50000000000E+00,
116116
5.00000000000E+00, 5.25000000000E+00, 5.50000000000E+00, 5.75000000000E+00,

python/test/block/Test_ACEtk_PhotoNuclearSecondaryParticleLocatorBlock.py renamed to python/test/block/Test_ACEtk_PhotonuclearSecondaryParticleLocatorBlock.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# third party imports
55

66
# local imports
7-
from ACEtk import PhotoNuclearSecondaryParticleLocatorBlock
7+
from ACEtk import PhotonuclearSecondaryParticleLocatorBlock
88

9-
class Test_ACEtk_PhotoNuclearSecondaryParticleLocatorBlock( unittest.TestCase ) :
10-
"""Unit test for the PhotoNuclearSecondaryParticleLocatorBlock class."""
9+
class Test_ACEtk_PhotonuclearSecondaryParticleLocatorBlock( unittest.TestCase ) :
10+
"""Unit test for the PhotonuclearSecondaryParticleLocatorBlock class."""
1111

1212
chunk = [ 1, 2,
1313
543, 635, 727, 729,
@@ -93,7 +93,7 @@ def verify_chunk( self, chunk ) :
9393
self.assertAlmostEqual( self.chunk[index], xss[index] )
9494

9595
# the data is given explicitly
96-
chunk = PhotoNuclearSecondaryParticleLocatorBlock(
96+
chunk = PhotonuclearSecondaryParticleLocatorBlock(
9797
types = [ 1, 2, 9, 31, 32, 33, 34 ],
9898
numbers = [ 2, 1, 1, 1, 1, 1, 1 ],
9999
locators = [ [ 543, 635, 727, 729,

‎src/ACEtk.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "ACEtk/ContinuousEnergyTable.hpp"
2020
#include "ACEtk/DosimetryTable.hpp"
2121
#include "ACEtk/PhotoatomicTable.hpp"
22+
#include "ACEtk/PhotonuclearTable.hpp"
2223
#include "ACEtk/ThermalScatteringTable.hpp"
2324

2425
#ifndef ACETK_HPP

src/ACEtk/PhotoNuclearTable.hpp renamed to src/ACEtk/PhotonuclearTable.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
// other includes
77
#include "ACEtk/Table.hpp"
8-
#include "ACEtk/block/PhotoNuclearPrincipalCrossSectionBlock.hpp"
8+
#include "ACEtk/block/PhotonuclearPrincipalCrossSectionBlock.hpp"
99
#include "ACEtk/block/ReactionNumberBlock.hpp"
1010
#include "ACEtk/block/ReactionQValueBlock.hpp"
1111
#include "ACEtk/block/CrossSectionBlock.hpp"
12-
#include "ACEtk/block/PhotoNuclearSecondaryParticleLocatorBlock.hpp"
12+
#include "ACEtk/block/PhotonuclearSecondaryParticleLocatorBlock.hpp"
1313
#include "ACEtk/block/CrossSectionData.hpp"
1414
#include "ACEtk/block/FrameAndMultiplicityBlock.hpp"
1515
#include "ACEtk/block/SecondaryParticleProductionCrossSectionBlock.hpp"
@@ -25,7 +25,7 @@ namespace ACEtk {
2525
*
2626
* The PhotoAtomicTable class represents the ACE table for the photonuclear data.
2727
*/
28-
class PhotoNuclearTable : protected Table {
28+
class PhotonuclearTable : protected Table {
2929

3030
/* fields */
3131
block::ESZU eszu_;
@@ -43,12 +43,12 @@ class PhotoNuclearTable : protected Table {
4343
std::vector< block::DLWH > dlwh_;
4444

4545
/* auxiliary functions */
46-
#include "ACEtk/PhotoNuclearTable/src/generateBlocks.hpp"
47-
#include "ACEtk/PhotoNuclearTable/src/generateData.hpp"
46+
#include "ACEtk/PhotonuclearTable/src/generateBlocks.hpp"
47+
#include "ACEtk/PhotonuclearTable/src/generateData.hpp"
4848

4949
public:
5050

51-
#include "ACEtk/PhotoNuclearTable/src/ctor.hpp"
51+
#include "ACEtk/PhotonuclearTable/src/ctor.hpp"
5252

5353
using Table::header;
5454
using Table::data;

0 commit comments

Comments
 (0)