Changing the ZAP type to an int in MF26

Author: whaeck

python/src/section/26/Multiplicity.python.cpp

@@ -32,7 +32,7 @@ void wrapMultiplicity( python::module& module, python::module& ) {
   component
   .def(
 
-    python::init< double, double, int,
+    python::init< int, double, int,
                   std::vector< long >&&, std::vector< long >&&,
                   std::vector< double >&&, std::vector< double >&& >(),
     python::arg( "zap" ), python::arg( "awi" ), python::arg( "law" ),

python/test/MF26/Test_ENDFtk_MF26_ReactionProduct.py

@@ -51,11 +51,11 @@ def test_component( self ) :
         def verify_chunk_law1( self, chunk ) :
 
             # verify content
-            self.assertAlmostEqual( 1000., chunk.ZAP )
+            self.assertEqual( 1000, chunk.ZAP )
             self.assertAlmostEqual( 0.9992414, chunk.AWI )
             self.assertEqual( 1, chunk.LAW )
 
-            self.assertAlmostEqual( 1000., chunk.multiplicity.ZAP )
+            self.assertEqual( 1000, chunk.multiplicity.ZAP )
             self.assertAlmostEqual( 0.9992414, chunk.multiplicity.AWI )
             self.assertEqual( 1, chunk.multiplicity.LAW )
 
@@ -121,7 +121,7 @@ def verify_chunk_law1( self, chunk ) :
             self.assertEqual( self.chunk_law1, chunk.to_string( 100, 26, 525 ) )
 
         # the data is given explicitly
-        multiplicity = Multiplicity( zap = 1000., awi = 0.9992414, law = 1,
+        multiplicity = Multiplicity( zap = 1000, awi = 0.9992414, law = 1,
                                      boundaries = [ 2 ], interpolants = [ 4 ],
                                      energies = [ 10., 1e+11 ],
                                      multiplicities = [ 1., 1. ] )

python/test/MF26/Test_ENDFtk_MF26_Section.py

@@ -47,11 +47,11 @@ def verify_chunk( self, chunk ) :
             products = chunk.reaction_products
             self.assertEqual( 1, len( products ) )
 
-            self.assertAlmostEqual( 1000., products[0].ZAP )
+            self.assertEqual( 1000, products[0].ZAP )
             self.assertAlmostEqual( 0.9992414, products[0].AWI )
             self.assertEqual( 1, products[0].LAW )
 
-            self.assertAlmostEqual( 1000., products[0].multiplicity.ZAP )
+            self.assertEqual( 1000, products[0].multiplicity.ZAP )
             self.assertAlmostEqual( 0.9992414, products[0].multiplicity.AWI )
             self.assertEqual( 1, products[0].multiplicity.LAW )
 

src/ENDFtk/section/26/Multiplicity.hpp

@@ -19,7 +19,10 @@ class Multiplicity : protected TabulationRecord {
   /**
    *  @brief Return the ZA identifier of the reaction product
    */
-  double ZAP() const { return TabulationRecord::C1(); }
+  int ZAP() const {
+    
+    return static_cast< int >( std::round( TabulationRecord::C1() ) ); 
+  }
 
   /**
    *  @brief Return the ZA identifier of the reaction product

src/ENDFtk/section/26/Multiplicity/src/ctor.hpp

@@ -9,12 +9,12 @@
  *  @param[in] energies          the x values
  *  @param[in] multiplicities    the function values
  */
-Multiplicity( double zap, double awi, long law,
+Multiplicity( int zap, double awi, long law,
               std::vector< long >&& boundaries,
               std::vector< long >&& interpolants,
               std::vector< double >&& energies,
               std::vector< double >&& multiplicities )
-  try : TabulationRecord( zap, awi, 0, law,
+  try : TabulationRecord( static_cast< double >( zap ), awi, 0, law,
                           std::move( boundaries ),
                           std::move( interpolants ),
                           std::move( energies ),

src/ENDFtk/section/26/Multiplicity/test/Multiplicity.test.cpp

@@ -25,7 +25,7 @@ SCENARIO( "Multiplicity" ) {
 
     WHEN( "the data is given explicitly" ) {
 
-      double zap = 11.;
+      int zap = 11;
       double awi = 5.438673E-4;
       long law = 2;
       std::vector< long > boundaries = { 2 };
@@ -84,7 +84,7 @@ SCENARIO( "Multiplicity" ) {
 
       // no need to test every possibility (TAB1 takes care of tests)
 
-      double zap = 11.;
+      int zap = 11;
       double awi = 5.438673E-4;
       long law = 2;
       std::vector< long > wrongBoundaries = { 4, 2 };
@@ -129,8 +129,8 @@ std::string chunk() {
 
 void verifyChunk( const Multiplicity& chunk ) {
 
-  CHECK_THAT( 11., WithinRel( chunk.ZAP() ) );
-  CHECK_THAT( 11., WithinRel( chunk.productIdentifier() ) );
+  CHECK( 11 == chunk.ZAP() );
+  CHECK( 11 == chunk.productIdentifier() );
   CHECK_THAT( 5.438673e-4, WithinRel( chunk.AWI() ) );
   CHECK_THAT( 5.438673e-4, WithinRel( chunk.projectileWeightRatio() ) );
   CHECK( 2 == chunk.LAW() );

src/ENDFtk/section/26/ReactionProduct.hpp

@@ -28,12 +28,12 @@ class ReactionProduct {
   /**
    *  @brief Return the ZA identifier of the reaction product
    */
-  double ZAP() const { return this->multiplicity_.ZAP(); }
+  int ZAP() const { return this->multiplicity_.ZAP(); }
 
   /**
    *  @brief Return the ZA identifier of the reaction product
    */
-  double productIdentifier() const { return this->ZAP(); }
+  int productIdentifier() const { return this->ZAP(); }
 
   /**
    *  @brief Return the atomic weight ratio of the projectile

src/ENDFtk/section/26/ReactionProduct/test/ReactionProduct.test.cpp

@@ -44,7 +44,7 @@ SCENARIO( "ReactionProduct" ) {
     WHEN( "the data is given explicitly" ) {
 
       Multiplicity multiplicity(
-        1000., .9992414, 1, { 2 }, { 4 },
+        1000, .9992414, 1, { 2 }, { 4 },
         { 10., 1e+11 },
         { 1., 1. } );
       Distribution distribution =
@@ -106,7 +106,7 @@ SCENARIO( "ReactionProduct" ) {
     WHEN( "the data is given explicitly" ) {
 
       Multiplicity multiplicity(
-        1000., .9992414, 2, { 2 }, { 4 },
+        1000, .9992414, 2, { 2 }, { 4 },
         { 10., 1e+11 },
         { 1., 1. } );
       Distribution distribution =
@@ -161,7 +161,7 @@ SCENARIO( "ReactionProduct" ) {
 
     WHEN( "the data is given explicitly" ) {
 
-      Multiplicity multiplicity( 11., 5.438673E-4, 8, { 2 }, { 2 },
+      Multiplicity multiplicity( 11, 5.438673E-4, 8, { 2 }, { 2 },
                                  { 10., 1.e+11 }, { 1., 1. } );
       Distribution distribution = EnergyTransfer( { 2 }, { 2 },
                                                   { 10., 1.e+11 },
@@ -210,7 +210,7 @@ SCENARIO( "ReactionProduct" ) {
   GIVEN( "an inconsistent LAW between the Multiplicity and the Distribution" ) {
 
     Multiplicity multiplicity(
-      1000., .9992414, 2, { 2 }, { 4 },
+      1000, .9992414, 2, { 2 }, { 4 },
       { 10., 1e+11 },
       { 1., 1. } );
     Distribution distribution =
@@ -432,11 +432,11 @@ std::string chunkWithLAW8() {
 
 void verifyChunkWithLAW8( const ReactionProduct& chunk ) {
 
-  CHECK_THAT( 11, WithinRel( chunk.ZAP() ) );
+  CHECK( 11 == chunk.ZAP() );
   CHECK_THAT( 5.438673e-4, WithinRel( chunk.AWI() ) );
   CHECK( 8 == chunk.LAW() );
 
-  CHECK_THAT( 11, WithinRel( chunk.multiplicity().ZAP() ) );
+  CHECK( 11 == chunk.multiplicity().ZAP() );
   CHECK_THAT( 5.438673e-4, WithinRel( chunk.multiplicity().AWI() ) );
 
   CHECK( 8 == chunk.multiplicity().LAW() );

src/ENDFtk/section/26/test/26.test.cpp

@@ -43,7 +43,7 @@ SCENARIO( "section::Type< 26 >" ) {
         ReactionProduct(
 
           // multiplicity
-          { 1000., .9992414, 1, { 2 }, { 4 },
+          { 1000, .9992414, 1, { 2 }, { 4 },
             { 10., 1e+11 },
             { 1., 1. } },
           // distribution
@@ -175,11 +175,11 @@ void verifyChunk( const section::Type< 26 >& chunk ) {
   auto products = chunk.reactionProducts();
   CHECK( 1 == products.size() );
 
-  CHECK_THAT( 1000., WithinRel( products[0].ZAP() ) );
+  CHECK( 1000 == products[0].ZAP() );
   CHECK_THAT( 0.9992414, WithinRel( products[0].AWI() ) );
   CHECK( 1 == products[0].LAW() );
 
-  CHECK_THAT( 1000., WithinRel( products[0].multiplicity().ZAP() ) );
+  CHECK( 1000 == products[0].multiplicity().ZAP() );
   CHECK_THAT( 0.9992414, WithinRel( products[0].multiplicity().AWI() ) );
   CHECK( 1 == products[0].multiplicity().LAW() );