Skip to content

Commit

Permalink
Merge branch 'feature/yield-columns' into 'develop'
Browse files Browse the repository at this point in the history 
Feature/yield columns

See merge request njoy/ENDFtk!10
  • Loading branch information
@whaeck
whaeck committed Oct 28, 2024
2 parents aa0c1ff + 597de9e commit 65b71a2
Show file tree
Hide file tree
Showing 10 changed files with 384 additions and 4 deletions.
28 changes: 28 additions & 0 deletions python/src/section/8/FissionYieldData.python.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,34 @@ void wrap_8_FissionYieldData( python::module& module, python::module& viewmodule
{ return self.isomericStates(); },
"The fission product isomeric states"
)
.def_property_readonly(

"FY",
[] ( const Component& self ) -> DoubleRange
{ return self.FY(); },
"The fission yield values"
)
.def_property_readonly(

"fission_yield_values",
[] ( const Component& self ) -> DoubleRange
{ return self.fissionYieldValues(); },
"The fission yield values"
)
.def_property_readonly(

"DFY",
[] ( const Component& self ) -> DoubleRange
{ return self.DFY(); },
"The fission yield uncertainties"
)
.def_property_readonly(

"fission_yield_uncertainties",
[] ( const Component& self ) -> DoubleRange
{ return self.fissionYieldUncertainties(); },
"The fission yield uncertainties"
)
.def_property_readonly(

"Y",
Expand Down
16 changes: 16 additions & 0 deletions python/test/MF8/Test_ENDFtk_MF8_FissionYieldData.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 3, len( chunk.fission_product_identifiers ) )
self.assertEqual( 3, len( chunk.FPS ) )
self.assertEqual( 3, len( chunk.isomeric_states ) )
self.assertEqual( 3, len( chunk.FY ) )
self.assertEqual( 3, len( chunk.fission_yield_values ) )
self.assertEqual( 3, len( chunk.DFY ) )
self.assertEqual( 3, len( chunk.fission_yield_uncertainties ) )
self.assertEqual( 3, len( chunk.Y ) )
self.assertEqual( 3, len( chunk.fission_yields ) )
self.assertEqual( 23066, chunk.ZAFP[0] )
Expand All @@ -49,6 +53,18 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 0, chunk.isomeric_states[0] )
self.assertEqual( 0, chunk.isomeric_states[1] )
self.assertEqual( 0, chunk.isomeric_states[2] )
self.assertAlmostEqual( 2.05032e-19, chunk.FY[0] )
self.assertAlmostEqual( 7.851250e-4, chunk.FY[1] )
self.assertAlmostEqual( 0, chunk.FY[2] )
self.assertAlmostEqual( 1.31220e-19, chunk.DFY[0] )
self.assertAlmostEqual( 4.710750e-5, chunk.DFY[1] )
self.assertAlmostEqual( 0, chunk.DFY[2] )
self.assertAlmostEqual( 2.05032e-19, chunk.fission_yield_values[0] )
self.assertAlmostEqual( 7.851250e-4, chunk.fission_yield_values[1] )
self.assertAlmostEqual( 0, chunk.fission_yield_values[2] )
self.assertAlmostEqual( 1.31220e-19, chunk.fission_yield_uncertainties[0] )
self.assertAlmostEqual( 4.710750e-5, chunk.fission_yield_uncertainties[1] )
self.assertAlmostEqual( 0, chunk.fission_yield_uncertainties[2] )
self.assertEqual( 2, len( chunk.Y[0] ) )
self.assertEqual( 2, len( chunk.Y[1] ) )
self.assertEqual( 2, len( chunk.Y[2] ) )
Expand Down
48 changes: 48 additions & 0 deletions python/test/MF8/Test_ENDFtk_MF8_MT454_Section.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 3, len( data.isomeric_states ) )
self.assertEqual( 3, len( data.Y ) )
self.assertEqual( 3, len( data.fission_yields ) )
self.assertEqual( 3, len( data.FY ) )
self.assertEqual( 3, len( data.fission_yield_values ) )
self.assertEqual( 3, len( data.DFY ) )
self.assertEqual( 3, len( data.fission_yield_uncertainties ) )
self.assertEqual( 23066, data.ZAFP[0] )
self.assertEqual( 54135, data.ZAFP[1] )
self.assertEqual( 72171, data.ZAFP[2] )
Expand All @@ -86,6 +90,18 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 0, data.isomeric_states[0] )
self.assertEqual( 0, data.isomeric_states[1] )
self.assertEqual( 0, data.isomeric_states[2] )
self.assertAlmostEqual( 2.05032e-19, data.FY[0] )
self.assertAlmostEqual( 7.851250e-4, data.FY[1] )
self.assertAlmostEqual( 0, data.FY[2] )
self.assertAlmostEqual( 1.31220e-19, data.DFY[0] )
self.assertAlmostEqual( 4.710750e-5, data.DFY[1] )
self.assertAlmostEqual( 0, data.DFY[2] )
self.assertAlmostEqual( 2.05032e-19, data.fission_yield_values[0] )
self.assertAlmostEqual( 7.851250e-4, data.fission_yield_values[1] )
self.assertAlmostEqual( 0, data.fission_yield_values[2] )
self.assertAlmostEqual( 1.31220e-19, data.fission_yield_uncertainties[0] )
self.assertAlmostEqual( 4.710750e-5, data.fission_yield_uncertainties[1] )
self.assertAlmostEqual( 0, data.fission_yield_uncertainties[2] )
self.assertEqual( 2, len( data.Y[0] ) )
self.assertEqual( 2, len( data.Y[1] ) )
self.assertEqual( 2, len( data.Y[2] ) )
Expand Down Expand Up @@ -119,6 +135,10 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 3, len( data.fission_product_identifiers ) )
self.assertEqual( 3, len( data.FPS ) )
self.assertEqual( 3, len( data.isomeric_states ) )
self.assertEqual( 3, len( data.FY ) )
self.assertEqual( 3, len( data.fission_yield_values ) )
self.assertEqual( 3, len( data.DFY ) )
self.assertEqual( 3, len( data.fission_yield_uncertainties ) )
self.assertEqual( 3, len( data.Y ) )
self.assertEqual( 3, len( data.fission_yields ) )
self.assertEqual( 23066, data.ZAFP[0] )
Expand All @@ -133,6 +153,18 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 0, data.isomeric_states[0] )
self.assertEqual( 0, data.isomeric_states[1] )
self.assertEqual( 0, data.isomeric_states[2] )
self.assertAlmostEqual( 4.48456e-18, data.FY[0] )
self.assertAlmostEqual( 1.196100e-3, data.FY[1] )
self.assertAlmostEqual( 0, data.FY[2] )
self.assertAlmostEqual( 2.87012e-18, data.DFY[0] )
self.assertAlmostEqual( 2.751030e-4, data.DFY[1] )
self.assertAlmostEqual( 0, data.DFY[2] )
self.assertAlmostEqual( 4.48456e-18, data.fission_yield_values[0] )
self.assertAlmostEqual( 1.196100e-3, data.fission_yield_values[1] )
self.assertAlmostEqual( 0, data.fission_yield_values[2] )
self.assertAlmostEqual( 2.87012e-18, data.fission_yield_uncertainties[0] )
self.assertAlmostEqual( 2.751030e-4, data.fission_yield_uncertainties[1] )
self.assertAlmostEqual( 0, data.fission_yield_uncertainties[2] )
self.assertEqual( 2, len( data.Y[0] ) )
self.assertEqual( 2, len( data.Y[1] ) )
self.assertEqual( 2, len( data.Y[2] ) )
Expand Down Expand Up @@ -192,6 +224,10 @@ def verify_chunk_energy_independent( self, chunk ) :
self.assertEqual( 3, len( data.fission_product_identifiers ) )
self.assertEqual( 3, len( data.FPS ) )
self.assertEqual( 3, len( data.isomeric_states ) )
self.assertEqual( 3, len( data.FY ) )
self.assertEqual( 3, len( data.fission_yield_values ) )
self.assertEqual( 3, len( data.DFY ) )
self.assertEqual( 3, len( data.fission_yield_uncertainties ) )
self.assertEqual( 3, len( data.Y ) )
self.assertEqual( 3, len( data.fission_yields ) )
self.assertEqual( 23066, data.ZAFP[0] )
Expand All @@ -206,6 +242,18 @@ def verify_chunk_energy_independent( self, chunk ) :
self.assertEqual( 0, data.isomeric_states[0] )
self.assertEqual( 0, data.isomeric_states[1] )
self.assertEqual( 0, data.isomeric_states[2] )
self.assertAlmostEqual( 2.05032e-19, data.FY[0] )
self.assertAlmostEqual( 7.851250e-4, data.FY[1] )
self.assertAlmostEqual( 0, data.FY[2] )
self.assertAlmostEqual( 1.31220e-19, data.DFY[0] )
self.assertAlmostEqual( 4.710750e-5, data.DFY[1] )
self.assertAlmostEqual( 0, data.DFY[2] )
self.assertAlmostEqual( 2.05032e-19, data.fission_yield_values[0] )
self.assertAlmostEqual( 7.851250e-4, data.fission_yield_values[1] )
self.assertAlmostEqual( 0, data.fission_yield_values[2] )
self.assertAlmostEqual( 1.31220e-19, data.fission_yield_uncertainties[0] )
self.assertAlmostEqual( 4.710750e-5, data.fission_yield_uncertainties[1] )
self.assertAlmostEqual( 0, data.fission_yield_uncertainties[2] )
self.assertEqual( 2, len( data.Y[0] ) )
self.assertEqual( 2, len( data.Y[1] ) )
self.assertEqual( 2, len( data.Y[2] ) )
Expand Down
48 changes: 48 additions & 0 deletions python/test/MF8/Test_ENDFtk_MF8_MT459_Section.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 3, len( data.isomeric_states ) )
self.assertEqual( 3, len( data.Y ) )
self.assertEqual( 3, len( data.fission_yields ) )
self.assertEqual( 3, len( data.FY ) )
self.assertEqual( 3, len( data.fission_yield_values ) )
self.assertEqual( 3, len( data.DFY ) )
self.assertEqual( 3, len( data.fission_yield_uncertainties ) )
self.assertEqual( 23066, data.ZAFP[0] )
self.assertEqual( 54135, data.ZAFP[1] )
self.assertEqual( 72171, data.ZAFP[2] )
Expand All @@ -86,6 +90,18 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 0, data.isomeric_states[0] )
self.assertEqual( 0, data.isomeric_states[1] )
self.assertEqual( 0, data.isomeric_states[2] )
self.assertAlmostEqual( 2.05032e-19, data.FY[0] )
self.assertAlmostEqual( 7.851250e-4, data.FY[1] )
self.assertAlmostEqual( 0, data.FY[2] )
self.assertAlmostEqual( 1.31220e-19, data.DFY[0] )
self.assertAlmostEqual( 4.710750e-5, data.DFY[1] )
self.assertAlmostEqual( 0, data.DFY[2] )
self.assertAlmostEqual( 2.05032e-19, data.fission_yield_values[0] )
self.assertAlmostEqual( 7.851250e-4, data.fission_yield_values[1] )
self.assertAlmostEqual( 0, data.fission_yield_values[2] )
self.assertAlmostEqual( 1.31220e-19, data.fission_yield_uncertainties[0] )
self.assertAlmostEqual( 4.710750e-5, data.fission_yield_uncertainties[1] )
self.assertAlmostEqual( 0, data.fission_yield_uncertainties[2] )
self.assertEqual( 2, len( data.Y[0] ) )
self.assertEqual( 2, len( data.Y[1] ) )
self.assertEqual( 2, len( data.Y[2] ) )
Expand Down Expand Up @@ -119,6 +135,10 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 3, len( data.fission_product_identifiers ) )
self.assertEqual( 3, len( data.FPS ) )
self.assertEqual( 3, len( data.isomeric_states ) )
self.assertEqual( 3, len( data.FY ) )
self.assertEqual( 3, len( data.fission_yield_values ) )
self.assertEqual( 3, len( data.DFY ) )
self.assertEqual( 3, len( data.fission_yield_uncertainties ) )
self.assertEqual( 3, len( data.Y ) )
self.assertEqual( 3, len( data.fission_yields ) )
self.assertEqual( 23066, data.ZAFP[0] )
Expand All @@ -133,6 +153,18 @@ def verify_chunk( self, chunk ) :
self.assertEqual( 0, data.isomeric_states[0] )
self.assertEqual( 0, data.isomeric_states[1] )
self.assertEqual( 0, data.isomeric_states[2] )
self.assertAlmostEqual( 4.48456e-18, data.FY[0] )
self.assertAlmostEqual( 1.196100e-3, data.FY[1] )
self.assertAlmostEqual( 0, data.FY[2] )
self.assertAlmostEqual( 2.87012e-18, data.DFY[0] )
self.assertAlmostEqual( 2.751030e-4, data.DFY[1] )
self.assertAlmostEqual( 0, data.DFY[2] )
self.assertAlmostEqual( 4.48456e-18, data.fission_yield_values[0] )
self.assertAlmostEqual( 1.196100e-3, data.fission_yield_values[1] )
self.assertAlmostEqual( 0, data.fission_yield_values[2] )
self.assertAlmostEqual( 2.87012e-18, data.fission_yield_uncertainties[0] )
self.assertAlmostEqual( 2.751030e-4, data.fission_yield_uncertainties[1] )
self.assertAlmostEqual( 0, data.fission_yield_uncertainties[2] )
self.assertEqual( 2, len( data.Y[0] ) )
self.assertEqual( 2, len( data.Y[1] ) )
self.assertEqual( 2, len( data.Y[2] ) )
Expand Down Expand Up @@ -191,6 +223,10 @@ def verify_chunk_energy_independent( self, chunk ) :
self.assertEqual( 3, len( data.fission_product_identifiers ) )
self.assertEqual( 3, len( data.FPS ) )
self.assertEqual( 3, len( data.isomeric_states ) )
self.assertEqual( 3, len( data.FY ) )
self.assertEqual( 3, len( data.fission_yield_values ) )
self.assertEqual( 3, len( data.DFY ) )
self.assertEqual( 3, len( data.fission_yield_uncertainties ) )
self.assertEqual( 3, len( data.Y ) )
self.assertEqual( 3, len( data.fission_yields ) )
self.assertEqual( 23066, data.ZAFP[0] )
Expand All @@ -205,6 +241,18 @@ def verify_chunk_energy_independent( self, chunk ) :
self.assertEqual( 0, data.isomeric_states[0] )
self.assertEqual( 0, data.isomeric_states[1] )
self.assertEqual( 0, data.isomeric_states[2] )
self.assertAlmostEqual( 2.05032e-19, data.FY[0] )
self.assertAlmostEqual( 7.851250e-4, data.FY[1] )
self.assertAlmostEqual( 0, data.FY[2] )
self.assertAlmostEqual( 1.31220e-19, data.DFY[0] )
self.assertAlmostEqual( 4.710750e-5, data.DFY[1] )
self.assertAlmostEqual( 0, data.DFY[2] )
self.assertAlmostEqual( 2.05032e-19, data.fission_yield_values[0] )
self.assertAlmostEqual( 7.851250e-4, data.fission_yield_values[1] )
self.assertAlmostEqual( 0, data.fission_yield_values[2] )
self.assertAlmostEqual( 1.31220e-19, data.fission_yield_uncertainties[0] )
self.assertAlmostEqual( 4.710750e-5, data.fission_yield_uncertainties[1] )
self.assertAlmostEqual( 0, data.fission_yield_uncertainties[2] )
self.assertEqual( 2, len( data.Y[0] ) )
self.assertEqual( 2, len( data.Y[1] ) )
self.assertEqual( 2, len( data.Y[2] ) )
Expand Down
Loading

0 comments on commit 65b71a2

Please sign in to comment.