Chain.get_thermal_fission_yields -> Chain.get_default_fission_yields

This commit is contained in:
Andrew Johnson 2019-09-11 10:41:58 -05:00
parent 2c965ef7f8
commit 1a4bbb9068
No known key found for this signature in database
GPG key ID: 253418E91B7F6FEB
3 changed files with 7 additions and 7 deletions

View file

@ -398,7 +398,7 @@ class Chain(object):
clean_indentation(root_elem)
tree.write(str(filename), encoding='utf-8')
def get_thermal_fission_yields(self):
def get_default_fission_yields(self):
"""Return fission yields at lowest incident neutron energy
Used as the default set of fission yields for :meth:`form_matrix`
@ -440,13 +440,13 @@ class Chain(object):
See Also
--------
:meth:`get_thermal_fission_yields`
:meth:`get_default_fission_yields`
"""
matrix = defaultdict(float)
reactions = set()
if fission_yields is None:
fission_yields = self.get_thermal_fission_yields()
fission_yields = self.get_default_fission_yields()
for i, nuc in enumerate(self.nuclides):
@ -721,7 +721,7 @@ class Chain(object):
@property
def fission_yields(self):
if self._fission_yields is None:
self._fission_yields = [self.get_thermal_fission_yields()]
self._fission_yields = [self.get_default_fission_yields()]
return self._fission_yields
@fission_yields.setter

View file

@ -83,7 +83,7 @@ class TestChain(object):
fission_yields = [None]
@staticmethod
def get_thermal_fission_yields():
def get_default_fission_yields():
return None
def form_matrix(self, rates, _fission_yields=None):

View file

@ -385,13 +385,13 @@ def test_set_alpha_branches():
def test_simple_fission_yields(simple_chain):
"""Check the default fission yields that can be used to form the matrix
"""
fission_yields = simple_chain.get_thermal_fission_yields()
fission_yields = simple_chain.get_default_fission_yields()
assert fission_yields == {"C": {"A": 0.0292737, "B": 0.002566345}}
def test_fission_yield_attribute(simple_chain):
"""Test the fission_yields property"""
thermal_yields = simple_chain.get_thermal_fission_yields()
thermal_yields = simple_chain.get_default_fission_yields()
# generate default with property
assert simple_chain.fission_yields[0] == thermal_yields
empty_chain = Chain()