Skip to content

Commit d225624

Browse files
whaeckwhaeck
committed
Updating name in python bindings
1 parent ab19958 commit d225624

14 files changed

Lines changed: 72 additions & 72 deletions

‎CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,18 @@ if(ACEtk.python)
149149
python/src/block/ThermalScatteringDiscreteCosinesWithProbability.python.cpp
150150
python/src/block/ThermalScatteringElasticAngularDistributionBlock.python.cpp
151151
python/src/block/ThermalScatteringInelasticAngularDistributionBlock.python.cpp
152-
python/src/block/PhotoAtomicPrincipalCrossSectionBlock.python.cpp
152+
python/src/block/PhotoatomicPrincipalCrossSectionBlock.python.cpp
153153
python/src/block/IncoherentScatteringFunctionBlock.python.cpp
154154
python/src/block/CoherentFormFactorBlock.python.cpp
155-
python/src/block/PhotoAtomicFluorescenceDataBlock.python.cpp
156-
python/src/block/PhotoAtomicHeatingNumbersBlock.python.cpp
157-
python/src/block/PhotoAtomicElectronShellBlock.python.cpp
158-
python/src/block/PhotoAtomicComptonProfile.python.cpp
159-
python/src/block/PhotoAtomicComptonProfileBlock.python.cpp
155+
python/src/block/PhotoatomicFluorescenceDataBlock.python.cpp
156+
python/src/block/PhotoatomicHeatingNumbersBlock.python.cpp
157+
python/src/block/PhotoatomicElectronShellBlock.python.cpp
158+
python/src/block/PhotoatomicComptonProfile.python.cpp
159+
python/src/block/PhotoatomicComptonProfileBlock.python.cpp
160160
python/src/ContinuousEnergyTable.python.cpp
161161
python/src/DosimetryTable.python.cpp
162162
python/src/ThermalScatteringTable.python.cpp
163-
python/src/PhotoAtomicTable.python.cpp
163+
python/src/PhotoatomicTable.python.cpp
164164
)
165165

166166
target_link_libraries( ACEtk.python PRIVATE ACEtk )

python/src/PhotoAtomicTable.python.cpp renamed to python/src/PhotoatomicTable.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/PhotoAtomicTable.hpp"
6+
#include "ACEtk/PhotoatomicTable.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 wrapPhotoAtomicTable( python::module& module, python::module& ) {
14+
void wrapPhotoatomicTable( python::module& module, python::module& ) {
1515

1616
// type aliases
1717
using Header = njoy::ACEtk::Table::Header;
18-
using Table = njoy::ACEtk::PhotoAtomicTable;
18+
using Table = njoy::ACEtk::PhotoatomicTable;
1919
using ESZG = njoy::ACEtk::block::ESZG;
2020
using JINC = njoy::ACEtk::block::JINC;
2121
using JCOH = njoy::ACEtk::block::JCOH;
@@ -30,9 +30,9 @@ void wrapPhotoAtomicTable( python::module& module, python::module& ) {
3030
python::class_< Table > table(
3131

3232
module,
33-
"PhotoAtomicTable",
33+
"PhotoatomicTable",
3434
"A thermal scattering ACE table\n\n"
35-
"The PhotoAtomicTable class represents the ACE table for photoatomic data."
35+
"The PhotoatomicTable class represents the ACE table for photoatomic data."
3636
);
3737

3838
// wrap the table

python/src/block/PhotoAtomicComptonProfile.python.cpp renamed to python/src/block/PhotoatomicComptonProfile.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/PhotoAtomicComptonProfile.hpp"
6+
#include "ACEtk/block/PhotoatomicComptonProfile.hpp"
77
#include "views.hpp"
88
#include "definitions.hpp"
99

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

1313
namespace block {
1414

15-
void wrapPhotoAtomicComptonProfile( python::module& module, python::module& ) {
15+
void wrapPhotoatomicComptonProfile( python::module& module, python::module& ) {
1616

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

2020
// wrap views created by this block
2121

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

2525
module,
26-
"PhotoAtomicComptonProfile",
26+
"PhotoatomicComptonProfile",
2727
"Tabulated Compton profile data for a given electron shell\n\n"
28-
"The PhotoAtomicComptonProfile class contains the probability density\n"
28+
"The PhotoatomicComptonProfile class contains the probability density\n"
2929
"function (PDF) and cumulative density function (CDF) as a function of\n"
3030
"momentum. It is used in the LSWD block."
3131
);

python/src/block/PhotoAtomicComptonProfileBlock.python.cpp renamed to python/src/block/PhotoatomicComptonProfileBlock.python.cpp

Lines changed: 7 additions & 7 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/PhotoAtomicComptonProfileBlock.hpp"
6+
#include "ACEtk/block/PhotoatomicComptonProfileBlock.hpp"
77
#include "views.hpp"
88
#include "definitions.hpp"
99

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

1313
namespace block {
1414

15-
void wrapPhotoAtomicComptonProfileBlock( python::module& module, python::module& ) {
15+
void wrapPhotoatomicComptonProfileBlock( python::module& module, python::module& ) {
1616

1717
// type aliases
18-
using Block = njoy::ACEtk::block::PhotoAtomicComptonProfileBlock;
19-
using PhotoAtomicComptonProfile = njoy::ACEtk::block::PhotoAtomicComptonProfile;
18+
using Block = njoy::ACEtk::block::PhotoatomicComptonProfileBlock;
19+
using PhotoatomicComptonProfile = njoy::ACEtk::block::PhotoatomicComptonProfile;
2020

2121
// wrap views created by this block
2222

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

2626
module,
27-
"PhotoAtomicComptonProfileBlock",
27+
"PhotoatomicComptonProfileBlock",
2828
"The photoatomic LSWD and SWD block with the compton profile data\n\n"
29-
"The PhotoAtomicComptonProfileBlock class contains NXS(5) sets of compton\n"
29+
"The PhotoatomicComptonProfileBlock class contains NXS(5) sets of compton\n"
3030
"profiles, one for each electron shell."
3131
);
3232

3333
// wrap the block
3434
block
3535
.def(
3636

37-
python::init< std::vector< PhotoAtomicComptonProfile > >(),
37+
python::init< std::vector< PhotoatomicComptonProfile > >(),
3838
python::arg( "profiles" ),
3939
"Initialise the block\n\n"
4040
"Arguments:\n"

python/src/block/PhotoAtomicElectronShellBlock.python.cpp renamed to python/src/block/PhotoatomicElectronShellBlock.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/PhotoAtomicElectronShellBlock.hpp"
6+
#include "ACEtk/block/PhotoatomicElectronShellBlock.hpp"
77
#include "views.hpp"
88
#include "definitions.hpp"
99

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

1313
namespace block {
1414

15-
void wrapPhotoAtomicElectronShellBlock( python::module& module, python::module& ) {
15+
void wrapPhotoatomicElectronShellBlock( python::module& module, python::module& ) {
1616

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

2020
// wrap views created by this block
2121

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

2525
module,
26-
"PhotoAtomicElectronShellBlock",
26+
"PhotoatomicElectronShellBlock",
2727
"The photoatomic LNEPS, LBEPS and LPIPS block with the electron shell data\n\n"
28-
"The PhotoAtomicPrincipalCrossSectionBlock class contains 3 arrays of the\n"
28+
"The PhotoatomicPrincipalCrossSectionBlock class contains 3 arrays of the\n"
2929
"same length:\n"
3030
" - the number of electrons for each shell\n"
3131
" - the binding energy for each shell\n"

python/src/block/PhotoAtomicFluorescenceDataBlock.python.cpp renamed to python/src/block/PhotoatomicFluorescenceDataBlock.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/PhotoAtomicFluorescenceDataBlock.hpp"
6+
#include "ACEtk/block/PhotoatomicFluorescenceDataBlock.hpp"
77
#include "views.hpp"
88
#include "definitions.hpp"
99

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

1313
namespace block {
1414

15-
void wrapPhotoAtomicFluorescenceDataBlock( python::module& module, python::module& ) {
15+
void wrapPhotoatomicFluorescenceDataBlock( python::module& module, python::module& ) {
1616

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

2020
// wrap views created by this block
2121

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

2525
module,
26-
"PhotoAtomicFluorescenceDataBlock",
26+
"PhotoatomicFluorescenceDataBlock",
2727
"The photoatomic JFLO block with the fluorescence data\n\n"
28-
"The PhotoAtomicFluorescenceDataBlock class contains 4 arrays of the\n"
28+
"The PhotoatomicFluorescenceDataBlock class contains 4 arrays of the\n"
2929
"same length:\n"
3030
" - the fluoresence edge energies\n"
3131
" - the relative ejection probabilities\n"

python/src/block/PhotoAtomicHeatingNumbersBlock.python.cpp renamed to python/src/block/PhotoatomicHeatingNumbersBlock.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/PhotoAtomicHeatingNumbersBlock.hpp"
6+
#include "ACEtk/block/PhotoatomicHeatingNumbersBlock.hpp"
77
#include "views.hpp"
88
#include "definitions.hpp"
99

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

1313
namespace block {
1414

15-
void wrapPhotoAtomicHeatingNumbersBlock( python::module& module, python::module& ) {
15+
void wrapPhotoatomicHeatingNumbersBlock( python::module& module, python::module& ) {
1616

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

2020
// wrap views created by this block
2121

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

2525
module,
26-
"PhotoAtomicHeatingNumbersBlock",
26+
"PhotoatomicHeatingNumbersBlock",
2727
"The photoatomic LHNM block with the heating numbers\n\n"
28-
"The PhotoAtomicHeatingNumbersBlock class contains the heating numbers.\n"
28+
"The PhotoatomicHeatingNumbersBlock class contains the heating numbers.\n"
2929
"The size of the array is stored in NXS(3) and the corresponding energy\n"
3030
"points can be found in the ESZG block."
3131
);

python/src/block/PhotoAtomicPrincipalCrossSectionBlock.python.cpp renamed to python/src/block/PhotoatomicPrincipalCrossSectionBlock.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/PhotoAtomicPrincipalCrossSectionBlock.hpp"
6+
#include "ACEtk/block/PhotoatomicPrincipalCrossSectionBlock.hpp"
77
#include "views.hpp"
88
#include "definitions.hpp"
99

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

1313
namespace block {
1414

15-
void wrapPhotoAtomicPrincipalCrossSectionBlock( python::module& module, python::module& ) {
15+
void wrapPhotoatomicPrincipalCrossSectionBlock( python::module& module, python::module& ) {
1616

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

2020
// wrap views created by this block
2121

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

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

python/test/block/Test_ACEtk_PhotoAtomicComptonProfile.py renamed to python/test/block/Test_ACEtk_PhotoatomicComptonProfile.py

Lines changed: 5 additions & 5 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 PhotoAtomicComptonProfile
7+
from ACEtk import PhotoatomicComptonProfile
88

9-
class Test_ACEtk_PhotoAtomicComptonProfile( unittest.TestCase ) :
10-
"""Unit test for the PhotoAtomicComptonProfile class."""
9+
class Test_ACEtk_PhotoatomicComptonProfile( unittest.TestCase ) :
10+
"""Unit test for the PhotoatomicComptonProfile class."""
1111

1212
chunk = [ 2, 3, 1.00000000000E-11, 1.00000000000E+00,
1313
2.00000000000E+01, 0.50000000000E+00, 0.50000000000E+00, 0.50000000000E+00,
@@ -20,7 +20,7 @@ def verify_chunk( self, chunk ) :
2020
# verify content
2121
self.assertEqual( False, chunk.empty )
2222
self.assertEqual( 11, chunk.length )
23-
self.assertEqual( "PhotoAtomicComptonProfile", chunk.name )
23+
self.assertEqual( "PhotoatomicComptonProfile", chunk.name )
2424

2525
self.assertEqual( 2, chunk.interpolation )
2626
self.assertEqual( 3, chunk.number_values )
@@ -44,7 +44,7 @@ def verify_chunk( self, chunk ) :
4444
self.assertAlmostEqual( self.chunk[index], xss[index] )
4545

4646
# the data is given explicitly
47-
chunk = PhotoAtomicComptonProfile(
47+
chunk = PhotoatomicComptonProfile(
4848
interpolation = 2,
4949
momentum = [ 1e-11, 1., 20. ],
5050
pdf = [ 0.5, 0.5, 0.5 ],

python/test/block/Test_ACEtk_PhotoAtomicComptonProfileBlock.py renamed to python/test/block/Test_ACEtk_PhotoatomicComptonProfileBlock.py

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

66
# local imports
7-
from ACEtk import PhotoAtomicComptonProfileBlock
8-
from ACEtk import PhotoAtomicComptonProfile
7+
from ACEtk import PhotoatomicComptonProfileBlock
8+
from ACEtk import PhotoatomicComptonProfile
99

10-
class Test_ACEtk_PhotoAtomicComptonProfileBlock( unittest.TestCase ) :
11-
"""Unit test for the PhotoAtomicComptonProfileBlock class."""
10+
class Test_ACEtk_PhotoatomicComptonProfileBlock( unittest.TestCase ) :
11+
"""Unit test for the PhotoatomicComptonProfileBlock class."""
1212

1313
chunk = [ 1, 96, 2,
1414
31, 0.000000000000e+00, 5.000000000000e-02, 1.000000000000e-01,
@@ -137,10 +137,10 @@ def verify_chunk( self, chunk ) :
137137
self.assertAlmostEqual( self.chunk[index], xss[index] )
138138

139139
# the data is given explicitly
140-
chunk = PhotoAtomicComptonProfileBlock(
140+
chunk = PhotoatomicComptonProfileBlock(
141141
profiles = [
142142

143-
PhotoAtomicComptonProfile(
143+
PhotoatomicComptonProfile(
144144
2,
145145
[ 0.000000000000e+00, 5.000000000000e-02, 1.000000000000e-01,
146146
1.500000000000e-01, 2.000000000000e-01, 3.000000000000e-01, 4.000000000000e-01,
@@ -167,7 +167,7 @@ def verify_chunk( self, chunk ) :
167167
9.947352611489e-01, 9.970904507507e-01, 9.982343149508e-01, 9.992442488238e-01,
168168
9.998990193113e-01, 9.999704488190e-01, 9.999964412232e-01, 9.999990107013e-01,
169169
9.999998539663e-01, 1.000000000000e+00 ] ),
170-
PhotoAtomicComptonProfile(
170+
PhotoatomicComptonProfile(
171171
2,
172172
[ 0.000000000000e+00, 5.000000000000e-02, 1.000000000000e-01, 1.500000000000e-01,
173173
2.000000000000e-01, 3.000000000000e-01, 4.000000000000e-01, 5.000000000000e-01,

0 commit comments

Comments
 (0)