Merge pull request #456 from drewejohnson/drewj/xsplot-2-1-32-454

BUG Support more values like psepc on xsplot reader

Author: drewejohnson

docs/changelog.rst

@@ -16,6 +16,10 @@ Changelog
 
 .. _v0.9.4:
 
+0.9.4rc1
+========
+* Support for reading ``pspec`` fields in xsplot files
+
 :release-tag:`0.9.4rc0`
 ====================
 

serpentTools/data/plut_xs0.m

@@ -277,3 +277,35 @@
 2.93887E-01
 ];
 
+i94239_03c_pspec = [
+1.36082E-02 1.47639E-02
+3.27184E-03 5.25321E-03
+1.64140E-02 3.43399E-03
+1.37229E-02 1.50625E-03
+1.29750E-02 3.69478E-04
+5.16240E-02 2.72200E-04
+3.86610E-02 1.04400E-04
+1.29296E-01 6.31000E-05
+9.89280E-02 5.69788E-05
+3.75054E-01 1.55400E-05
+4.13713E-01 1.46600E-05
+9.87800E-02 1.46500E-05
+1.11820E-01 1.29767E-05
+5.68280E-02 1.15200E-05
+1.10928E-01 6.61565E-06
+2.03550E-01 5.69000E-06
+9.92700E-01 2.70000E-10
+8.16000E-01 2.40000E-10
+7.63600E-01 2.20000E-10
+9.86900E-01 2.10000E-10
+6.93200E-01 2.00000E-10
+7.92900E-01 2.00000E-10
+4.12300E-01 1.80000E-10
+1.00570E+00 1.80000E-10
+7.62600E-01 1.00000E-10
+6.70800E-01 9.00000E-11
+6.70990E-01 9.00000E-11
+9.18700E-01 8.40000E-11
+1.72560E-01 3.00000E-11
+1.23228E-01 1.60000E-11
+];

serpentTools/objects/xsdata.py

@@ -44,6 +44,9 @@ class XSData(NamedObject):
     metadata : dict
         File-wide metadata from the reader. Alias for accessing
         :attr:`energies`. Will be removed in the future
+    misc : dict of str to numpy.ndarray
+        Other arrays that do not have a dedicated attribute, e.g.,
+        ``pspec`` for photon line spectrum
 
     """
 
@@ -89,6 +92,8 @@ def __init__(self, name, metadata, isIso=False):
         # whether nu data present for fissionables
         self.hasNuData = False
 
+        self.misc = {}
+
     def __len__(self):
         """Number of reactions stored"""
         return len(self.MT)

serpentTools/parsers/xsplot.py

@@ -1,4 +1,7 @@
 """Parser responsible for reading the ``*_xsplot.m`` files"""
+import warnings
+import re
+
 from numpy import array, float64
 
 from serpentTools.messages import error, warning
@@ -44,6 +47,7 @@ class XSPlotReader(BaseReader):
         likely be removed in the future
 
     """
+    _misc = {"pspec", }
 
     def __init__(self, filePath):
         super().__init__(filePath, 'xsplot')
@@ -146,7 +150,22 @@ def _read(self):
                     self.xsections[xsname].setData(chunk)
 
                 else:
-                    raise ValueError("Unidentifiable entry\n{}".format(chunk))
+                    self._processMisc(lead, data)
+
+    def _processMisc(self, lead, data):
+        variable = lead.split()[0]
+        for key in self._misc:
+            start = variable.find(key)
+            if start == -1:
+                continue
+            xsname = re.sub("_$", "", variable[:start])
+            cleaned = list(map(str.split, data))
+            self.xsections[xsname].misc[key] = array(cleaned, dtype=float)
+            return
+
+        warnings.warn(
+            "Unidentifiable entry in {}: {}".format(self.filePath, lead)
+        )
 
     def _precheck(self):
         """do a quick scan to ensure this looks like a xsplot file."""

tests/test_xsplot.py

@@ -1,12 +1,14 @@
 """Test the xsplot reader."""
 import unittest
 from numpy import ndarray, array, newaxis
-
 from numpy.testing import assert_array_equal
+import pytest
 
 from serpentTools.parsers.xsplot import XSPlotReader
 from serpentTools.data import getFile
 
+DATA_FILE = getFile("plut_xs0.m")
+
 
 def findDiff(d1, d2, path=""):
     """ Diffs two dictionaries with nested structure
@@ -48,8 +50,7 @@ class XSPlotTester(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.file = getFile('plut_xs0.m')
-        cls.reader = XSPlotReader(cls.file)
+        cls.reader = XSPlotReader(DATA_FILE)
         cls.reader.read()
 
     def test1_allXS(self):
@@ -782,3 +783,59 @@ def test2_testPrintMT(self):
 """
         actual = self.reader.xsections['mfissile'].showMT(retstring=True)
         self.assertEqual(refString.rstrip(), actual.rstrip())
+
+
+def test_goodMisc():
+    reader = XSPlotReader(DATA_FILE)
+    reader.read()
+    pu = reader["i94239_03c"]
+    assert "pspec" in pu.misc
+    actualPspec = array(
+        [
+            [1.36082E-02, 1.47639E-02],
+            [3.27184E-03, 5.25321E-03],
+            [1.64140E-02, 3.43399E-03],
+            [1.37229E-02, 1.50625E-03],
+            [1.29750E-02, 3.69478E-04],
+            [5.16240E-02, 2.72200E-04],
+            [3.86610E-02, 1.04400E-04],
+            [1.29296E-01, 6.31000E-05],
+            [9.89280E-02, 5.69788E-05],
+            [3.75054E-01, 1.55400E-05],
+            [4.13713E-01, 1.46600E-05],
+            [9.87800E-02, 1.46500E-05],
+            [1.11820E-01, 1.29767E-05],
+            [5.68280E-02, 1.15200E-05],
+            [1.10928E-01, 6.61565E-06],
+            [2.03550E-01, 5.69000E-06],
+            [9.92700E-01, 2.70000E-10],
+            [8.16000E-01, 2.40000E-10],
+            [7.63600E-01, 2.20000E-10],
+            [9.86900E-01, 2.10000E-10],
+            [6.93200E-01, 2.00000E-10],
+            [7.92900E-01, 2.00000E-10],
+            [4.12300E-01, 1.80000E-10],
+            [1.00570E+00, 1.80000E-10],
+            [7.62600E-01, 1.00000E-10],
+            [6.70800E-01, 9.00000E-11],
+            [6.70990E-01, 9.00000E-11],
+            [9.18700E-01, 8.40000E-11],
+            [1.72560E-01, 3.00000E-11],
+            [1.23228E-01, 1.60000E-11],
+        ]
+    )
+    assert pu.misc["pspec"] == pytest.approx(actualPspec, rel=0, abs=0)
+
+
+@pytest.fixture
+def xsreaderNoPspec():
+    reader = XSPlotReader(DATA_FILE)
+    reader._misc.difference_update({"pspec", })
+    return reader
+
+
+def test_missingPspec(xsreaderNoPspec):
+    with pytest.warns(UserWarning, match="pspec"):
+        xsreaderNoPspec.read()
+    pu = xsreaderNoPspec["i94239_03c"]
+    assert "pspec" not in pu.misc