From 4586de20abf4d145467b802da4646ae0a058cea1 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 26 May 2020 11:33:36 -0500 Subject: [PATCH] Address @pshriwise comments on #1558 --- openmc/data/effective_dose/dose.py | 16 +++++++++------- setup.py | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/openmc/data/effective_dose/dose.py b/openmc/data/effective_dose/dose.py index 9f8ce87aec..4e4aa7ba95 100644 --- a/openmc/data/effective_dose/dose.py +++ b/openmc/data/effective_dose/dose.py @@ -33,22 +33,24 @@ def dose_coefficients(particle, geometry='AP'): This function provides fluence to dose conversion coefficients for effective dose for various types of external exposures based on values in `ICRP - Publication 116 `_. + Publication 116 `_. Corrected + values found in a correigendum are used rather than the values in the + original report. Parameters ---------- particle : {'neutron', 'photon', 'electron', 'positron'} Incident particle geometry : {'AP', 'PA', 'LLAT', 'RLAT', 'ROT', 'ISO'} - Irradiation geometry assumed. Refer to ICRP-116 for the meaning of the - options here. + Irradiation geometry assumed. Refer to ICRP-116 (Section 3.2) for the + meaning of the options here. Returns ------- energy : numpy.ndarray Energies at which dose conversion coefficients are given - dose : numpy.ndarray - Effective dose in [pSv cm^2] at provided energies + dose_coeffs : numpy.ndarray + Effective dose coefficients in [pSv cm^2] at provided energies """ if not _DOSE_ICRP116: @@ -67,5 +69,5 @@ def dose_coefficients(particle, geometry='AP'): # Pull out energy and dose from table energy = data[:, 0].copy() - dose = data[:, index + 1].copy() - return energy, dose + dose_coeffs = data[:, index + 1].copy() + return energy, dose_coeffs diff --git a/setup.py b/setup.py index c193645c35..8e0761b77c 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,8 @@ kwargs = { # Data files and librarries 'package_data': { 'openmc.lib': ['libopenmc.{}'.format(suffix)], - 'openmc.data': ['mass16.txt', 'BREMX.DAT', '*.h5'] + 'openmc.data': ['mass16.txt', 'BREMX.DAT', '*.h5'], + 'openmc.data.effective_dose': ['*.txt'] }, # Metadata