From b3c134e9bbef99e48261a18c8d665fdc58228d5a Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Mon, 8 Aug 2016 11:09:50 -0500 Subject: [PATCH] Update FissionEnergyRelease.from_hdf5 --- openmc/data/fission_energy.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/openmc/data/fission_energy.py b/openmc/data/fission_energy.py index 24743c19c..03d3ed84e 100644 --- a/openmc/data/fission_energy.py +++ b/openmc/data/fission_energy.py @@ -495,22 +495,13 @@ class FissionEnergyRelease(object): obj = cls() - obj.fragments = Polynomial(group['fragments'].value) - obj.delayed_neutrons = Polynomial(group['delayed_neutrons'].value) - obj.prompt_photons = Polynomial(group['prompt_photons'].value) - obj.delayed_photons = Polynomial(group['delayed_photons'].value) - obj.betas = Polynomial(group['betas'].value) - obj.neutrinos = Polynomial(group['neutrinos'].value) - - if group.attrs['format'].decode() == 'Madland': - obj.form = 'Madland' - obj.prompt_neutrons = Polynomial(group['prompt_neutrons'].value) - elif group.attrs['format'].decode() == 'Sher-Beck': - obj.form = 'Sher-Beck' - obj.prompt_neutrons = Tabulated1D.from_hdf5( - group['prompt_neutrons']) - else: - raise ValueError('Unrecognized energy release format') + obj.fragments = Function1D.from_hdf5(group['fragments']) + obj.prompt_neutrons = Function1D.from_hdf5(group['prompt_neutrons']) + obj.delayed_neutrons = Function1D.from_hdf5(group['delayed_neutrons']) + obj.prompt_photons = Function1D.from_hdf5(group['prompt_photons']) + obj.delayed_photons = Function1D.from_hdf5(group['delayed_photons']) + obj.betas = Function1D.from_hdf5(group['betas']) + obj.neutrinos = Function1D.from_hdf5(group['neutrinos']) return obj