From cb2a8e873572466dbe3eb83402fcfdd5d3a00a97 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Wed, 10 Jun 2015 23:01:16 -0600
Subject: [PATCH 1/4] Fixed indexing error in YN tallies

---
 src/tally.F90 | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/tally.F90 b/src/tally.F90
index a4fbe01cfd..f860149f6e 100644
--- a/src/tally.F90
+++ b/src/tally.F90
@@ -140,7 +140,7 @@ contains
         end if
 
 
-      case (SCORE_SCATTER_PN, SCORE_SCATTER_YN)
+      case (SCORE_SCATTER_PN)
         ! Only analog estimators are available.
         ! Skip any event where the particle didn't scatter
         if (p % event /= EVENT_SCATTER) then
@@ -153,6 +153,19 @@ contains
         score = p % last_wgt
 
 
+      case (SCORE_SCATTER_YN)
+        ! Only analog estimators are available.
+        ! Skip any event where the particle didn't scatter
+        if (p % event /= EVENT_SCATTER) then
+          i = i + (t % moment_order(i) + 1)**2 - 1
+          cycle SCORE_LOOP
+        end if
+        ! Since only scattering events make it here, again we can use
+        ! the weight entering the collision as the estimator for the
+        ! reaction rate
+        score = p % last_wgt
+
+
       case (SCORE_NU_SCATTER, SCORE_NU_SCATTER_N)
         ! Only analog estimators are available.
         ! Skip any event where the particle didn't scatter
@@ -163,7 +176,7 @@ contains
         score = p % wgt
 
 
-      case (SCORE_NU_SCATTER_PN, SCORE_NU_SCATTER_YN)
+      case (SCORE_NU_SCATTER_PN)
         ! Only analog estimators are available.
         ! Skip any event where the particle didn't scatter
         if (p % event /= EVENT_SCATTER) then
@@ -176,6 +189,19 @@ contains
         score = p % wgt
 
 
+      case (SCORE_NU_SCATTER_YN)
+        ! Only analog estimators are available.
+        ! Skip any event where the particle didn't scatter
+        if (p % event /= EVENT_SCATTER) then
+          i = i + (t % moment_order(i) + 1)**2 - 1
+          cycle SCORE_LOOP
+        end if
+        ! For scattering production, we need to use the post-collision
+        ! weight as the estimate for the number of neutrons exiting a
+        ! reaction with neutrons in the exit channel
+        score = p % wgt
+
+
       case (SCORE_TRANSPORT)
         ! Only analog estimators are available.
         ! Skip any event where the particle didn't scatter

From 4820aa7af84274913224b862325863bc72fae73d Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Thu, 11 Jun 2015 17:54:23 -0600
Subject: [PATCH 2/4] Added test with many tally scores

---
 tests/test_many_scores/geometry.xml        | 181 ++++++++++++++
 tests/test_many_scores/materials.xml       | 272 +++++++++++++++++++++
 tests/test_many_scores/results.py          |  37 +++
 tests/test_many_scores/results_true.dat    | 111 +++++++++
 tests/test_many_scores/settings.xml        |  19 ++
 tests/test_many_scores/tallies.xml         |  13 +
 tests/test_many_scores/test_many_scores.py |  63 +++++
 7 files changed, 696 insertions(+)
 create mode 100644 tests/test_many_scores/geometry.xml
 create mode 100644 tests/test_many_scores/materials.xml
 create mode 100644 tests/test_many_scores/results.py
 create mode 100644 tests/test_many_scores/results_true.dat
 create mode 100644 tests/test_many_scores/settings.xml
 create mode 100644 tests/test_many_scores/tallies.xml
 create mode 100644 tests/test_many_scores/test_many_scores.py

diff --git a/tests/test_many_scores/geometry.xml b/tests/test_many_scores/geometry.xml
new file mode 100644
index 0000000000..b85dd04df9
--- /dev/null
+++ b/tests/test_many_scores/geometry.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<geometry>
+
+  <surface id="1" type="z-cylinder" coeffs="0. 0. 0.41" />
+  <surface id="2" type="z-cylinder" coeffs="0. 0. 0.475" />
+  <surface id="3" type="z-cylinder" coeffs="0. 0. 0.56" />
+  <surface id="4" type="z-cylinder" coeffs="0. 0. 0.62" />
+  <surface id="5" type="z-cylinder" coeffs="0. 0. 187.6" />
+  <surface id="6" type="z-cylinder" coeffs="0. 0. 209.0" />
+  <surface id="7" type="z-cylinder" coeffs="0. 0. 229.0" />
+  <surface id="8" type="z-cylinder" coeffs="0. 0. 249.0" boundary="vacuum" />
+
+  <surface id="31" type="z-plane" coeffs="-229.0" boundary="vacuum" />
+  <surface id="32" type="z-plane" coeffs="-199.0" />
+  <surface id="33" type="z-plane" coeffs="-193.0" />
+  <surface id="34" type="z-plane" coeffs="-183.0" />
+  <surface id="35" type="z-plane" coeffs="0.0" />
+  <surface id="36" type="z-plane" coeffs="183.0" />
+  <surface id="37" type="z-plane" coeffs="203.0" />
+  <surface id="38" type="z-plane" coeffs="215.0" />
+  <surface id="39" type="z-plane" coeffs="223.0" boundary="vacuum" />
+
+  <!-- All geometry on base universe -->
+  <cell id="1"  fill="200"    surfaces="  -6 34 -35" /> <!-- Lower core -->
+  <cell id="2"  fill="201"    surfaces="  -6 35 -36" /> <!-- Upper core -->
+  <cell id="3"  material="8"  surfaces="  -7 31 -32" /> <!-- Lower core plate region -->
+  <cell id="4"  material="9"  surfaces="  -5 32 -33" /> <!-- Bottom nozzle region -->
+  <cell id="5"  material="12" surfaces="  -5 33 -34" /> <!-- Bottom FA region -->
+  <cell id="6"  material="11" surfaces="  -5 36 -37" /> <!-- Top FA region -->
+  <cell id="7"  material="10" surfaces="  -5 37 -38" /> <!-- Top nozzle region -->
+  <cell id="8"  material="7"  surfaces="  -7 38 -39" /> <!-- Upper plate region -->
+  <cell id="9"  material="4"  surfaces="6 -7 32 -38" /> <!-- Downcomer -->
+  <cell id="10" material="5"  surfaces="7 -8 31 -39" /> <!-- RPV -->
+  <cell id="11" material="6"  surfaces="5 -6 32 -34" /> <!-- Bottom of radial reflector -->
+  <cell id="12" material="7"  surfaces="5 -6 36 -38" /> <!-- Top of radial reflector -->
+
+  <!-- Fuel pin, cladding, cold water -->
+  <cell id="21" universe="1" material="1" surfaces="-1"   />
+  <cell id="22" universe="1" material="2" surfaces="1 -2" />
+  <cell id="23" universe="1" material="3" surfaces="2"    />
+
+  <!-- Instrumentation guide tube -->
+  <cell id="24" universe="2" material="3" surfaces="-3"   />
+  <cell id="25" universe="2" material="2" surfaces="3 -4" />
+  <cell id="26" universe="2" material="3" surfaces="4"    />
+
+  <!-- Fuel pin, cladding, hot water -->
+  <cell id="27" universe="3" material="1" surfaces="-1"   />
+  <cell id="28" universe="3" material="2" surfaces="1 -2" />
+  <cell id="29" universe="3" material="4" surfaces="2"    />
+
+  <!-- Instrumentation guide tube -->
+  <cell id="30" universe="4" material="4" surfaces="-3"   />
+  <cell id="31" universe="4" material="2" surfaces="3 -4" />
+  <cell id="32" universe="4" material="4" surfaces="4"    />
+
+  <!-- cell for water assembly (cold) -->
+  <cell id="50" universe="5" material="4" surfaces="34 -35" />
+
+  <!-- containing cell for fuel assembly -->
+  <cell id="60" universe="6" fill="100"   surfaces="34 -35" />
+
+  <!-- cell for water assembly (hot) -->
+  <cell id="70" universe="7" material="3" surfaces="35 -36" />
+
+  <!-- containing cell for fuel assembly -->
+  <cell id="80" universe="8" fill="101"   surfaces="35 -36" />
+
+  <!-- Fuel Assembly (Lower Half) -->
+  <lattice id="100">
+    <dimension>17 17</dimension>
+    <lower_left>-10.71 -10.71</lower_left>
+    <pitch>1.26 1.26</pitch>
+    <universes>
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
+      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 2 1 1 1 1 1 1 1 1 1 2 1 1 1
+      1 1 1 1 1 2 1 1 2 1 1 2 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+      1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+    </universes>
+  </lattice>
+
+  <!-- Fuel Assembly (Upper Half) -->
+  <lattice id="101">
+    <dimension>17 17</dimension>
+    <lower_left>-10.71 -10.71</lower_left>
+    <pitch>1.26 1.26</pitch>
+    <universes>
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
+      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 4 3 3 4 3 3 4 3 3 4 3 3 4 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 3 4 3 3 3 3 3 3 3 3 3 4 3 3 3
+      3 3 3 3 3 4 3 3 4 3 3 4 3 3 3 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
+    </universes>
+  </lattice>
+
+  <!-- Core Lattice (Lower Half) -->
+  <lattice id="200">
+    <dimension>21 21</dimension>
+    <lower_left>-224.91 -224.91</lower_left>
+    <pitch>21.42 21.42</pitch>
+    <universes>
+      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
+      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
+      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
+      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
+      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
+      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
+      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
+      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
+      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
+      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
+      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
+      5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5
+      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
+      5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5
+      5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5
+      5 5 5 5 5 6 6 6 6 6 6 6 6 6 6 6 5 5 5 5 5
+      5 5 5 5 5 5 5 6 6 6 6 6 6 6 5 5 5 5 5 5 5
+      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+      5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
+    </universes>
+  </lattice>
+
+  <!-- Core Lattice (Upper Half) -->
+  <lattice id="201">
+    <dimension>21 21</dimension>
+    <lower_left>-224.91 -224.91</lower_left>
+    <pitch>21.42 21.42</pitch>
+    <universes>
+      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
+      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
+      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
+      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
+      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
+      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
+      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
+      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
+      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
+      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
+      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
+      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
+      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
+      7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7
+      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
+      7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7
+      7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7
+      7 7 7 7 7 8 8 8 8 8 8 8 8 8 8 8 7 7 7 7 7
+      7 7 7 7 7 7 7 8 8 8 8 8 8 8 7 7 7 7 7 7 7
+      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
+      7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
+    </universes>
+  </lattice>
+
+</geometry>
diff --git a/tests/test_many_scores/materials.xml b/tests/test_many_scores/materials.xml
new file mode 100644
index 0000000000..9c0b74f3f1
--- /dev/null
+++ b/tests/test_many_scores/materials.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<materials>
+
+  <default_xs>71c</default_xs>
+
+  <!-- Fuel composition -->
+  <material id="1">
+    <density value="10.062" units="g/cm3" />
+    <nuclide name="U-234"   ao="4.9476e-6" />
+    <nuclide name="U-235"   ao="4.8218e-4" />
+    <nuclide name="U-236"   ao="9.0402e-5" />
+    <nuclide name="U-238"   ao="2.1504e-2" />
+    <nuclide name="Np-237"  ao="7.3733e-6" />
+    <nuclide name="Pu-238"  ao="1.5148e-6" />
+    <nuclide name="Pu-239"  ao="1.3955e-4" />
+    <nuclide name="Pu-240"  ao="3.4405e-5" />
+    <nuclide name="Pu-241"  ao="2.1439e-5" />
+    <nuclide name="Pu-242"  ao="3.7422e-6" />
+    <nuclide name="Am-241"  ao="4.5041e-7" />
+    <nuclide name="Am-242m" ao="9.2301e-9" />
+    <nuclide name="Am-243"  ao="4.7878e-7" />
+    <nuclide name="Cm-242"  ao="1.0485e-7" />
+    <nuclide name="Cm-243"  ao="1.4268e-9" />
+    <nuclide name="Cm-244"  ao="8.8756e-8" />
+    <nuclide name="Cm-245"  ao="3.5285e-9" />
+    <nuclide name="Mo-95"   ao="2.6497e-5" />
+    <nuclide name="Tc-99"   ao="3.2772e-5" />
+    <nuclide name="Ru-101"  ao="3.0742e-5" />
+    <nuclide name="Ru-103"  ao="2.3505e-6" />
+    <nuclide name="Ag-109"  ao="2.0009e-6" />
+    <nuclide name="Xe-135"  ao="1.0801e-8" />
+    <nuclide name="Cs-133"  ao="3.4612e-5" />
+    <nuclide name="Nd-143"  ao="2.6078e-5" />
+    <nuclide name="Nd-145"  ao="1.9898e-5" />
+    <nuclide name="Sm-147"  ao="1.6128e-6" />
+    <nuclide name="Sm-149"  ao="1.1627e-7" />
+    <nuclide name="Sm-150"  ao="7.1727e-6" />
+    <nuclide name="Sm-151"  ao="5.4947e-7" />
+    <nuclide name="Sm-152"  ao="3.0221e-6" />
+    <nuclide name="Eu-153"  ao="2.6209e-6" />
+    <nuclide name="Gd-155"  ao="1.5369e-9" />
+    <nuclide name="O-16"    ao="4.5737e-2" />
+  </material>
+
+  <!-- Cladding composition -->
+  <material id="2">
+    <density value="5.77" units="g/cm3" />
+    <nuclide name="Zr-90" ao="0.5145" />
+    <nuclide name="Zr-91" ao="0.1122" />
+    <nuclide name="Zr-92" ao="0.1715" />
+    <nuclide name="Zr-94" ao="0.1738" />
+    <nuclide name="Zr-96" ao="0.0280" />
+  </material>
+
+  <!-- Cold borated water -->
+  <material id="3">
+    <density value="0.07416" units="atom/b-cm" />
+    <nuclide name="H-1" ao="2.0" />
+    <nuclide name="O-16" ao="1.0" />
+    <nuclide name="B-10" ao="6.490e-4" />
+    <nuclide name="B-11" ao="2.689e-3" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+  <!-- Hot borated water -->
+  <material id="4">
+    <density value="0.06614" units="atom/b-cm" />
+    <nuclide name="H-1"  ao="2.0" />
+    <nuclide name="O-16" ao="1.0" />
+    <nuclide name="B-10" ao="6.490e-4" />
+    <nuclide name="B-11" ao="2.689e-3" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+  <!-- RPV Composition -->
+  <material id="5">
+    <density value="7.9" units="g/cm3" />
+    <nuclide name="Fe-54"  wo="0.05437098" />
+    <nuclide name="Fe-56"  wo="0.88500663" />
+    <nuclide name="Fe-57"  wo="0.0208008" />
+    <nuclide name="Fe-58"  wo="0.00282159" />
+    <nuclide name="Ni-58"  wo="0.0067198" />
+    <nuclide name="Ni-60"  wo="0.0026776" />
+    <nuclide name="Ni-61"  wo="0.0001183" />
+    <nuclide name="Ni-62"  wo="0.0003835" />
+    <nuclide name="Ni-64"  wo="0.0001008" />
+    <nuclide name="Mn-55"  wo="0.01" />
+    <nuclide name="Mo-92"  wo="0.000849" />
+    <nuclide name="Mo-94"  wo="0.0005418" />
+    <nuclide name="Mo-95"  wo="0.0009438" />
+    <nuclide name="Mo-96"  wo="0.0010002" />
+    <nuclide name="Mo-97"  wo="0.0005796" />
+    <nuclide name="Mo-98"  wo="0.0014814" />
+    <nuclide name="Mo-100" wo="0.0006042" />
+    <nuclide name="Si-28"  wo="0.00367464" />
+    <nuclide name="Si-29"  wo="0.00019336" />
+    <nuclide name="Si-30"  wo="0.000132" />
+    <nuclide name="Cr-50"  wo="0.00010435" />
+    <nuclide name="Cr-52"  wo="0.002092475" />
+    <nuclide name="Cr-53"  wo="0.00024185" />
+    <nuclide name="Cr-54"  wo="6.1325e-05" />
+    <nuclide name="C-Nat"  wo="0.0025" />
+    <nuclide name="Cu-63"  wo="0.0013696" />
+    <nuclide name="Cu-65"  wo="0.0006304" />
+  </material>
+
+  <!-- Lower radial reflector -->
+  <material id="6">
+    <density value="4.32" units="g/cm3" />
+    <nuclide name="H-1"   wo="0.0095661" />
+    <nuclide name="O-16"  wo="0.0759107" />
+    <nuclide name="B-10"  wo="3.08409e-5" />
+    <nuclide name="B-11"  wo="1.40499e-4" />
+    <nuclide name="Fe-54" wo="0.035620772088" />
+    <nuclide name="Fe-56" wo="0.579805982228" />
+    <nuclide name="Fe-57" wo="0.01362750048" />
+    <nuclide name="Fe-58" wo="0.001848545204" />
+    <nuclide name="Ni-58" wo="0.055298376566" />
+    <nuclide name="Ni-60" wo="0.022034425592" />
+    <nuclide name="Ni-61" wo="0.000973510811" />
+    <nuclide name="Ni-62" wo="0.003155886695" />
+    <nuclide name="Ni-64" wo="0.000829500336" />
+    <nuclide name="Mn-55" wo="0.0182870" />
+    <nuclide name="Si-28" wo="0.00839976771" />
+    <nuclide name="Si-29" wo="0.00044199679" />
+    <nuclide name="Si-30" wo="0.0003017355" />
+    <nuclide name="Cr-50" wo="0.007251360806" />
+    <nuclide name="Cr-52" wo="0.145407678031" />
+    <nuclide name="Cr-53" wo="0.016806340306" />
+    <nuclide name="Cr-54" wo="0.004261520857" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+  <!-- Upper radial reflector / Top plate region -->
+  <material id="7">
+    <density value="4.28" units="g/cm3" />
+    <nuclide name="H-1"   wo="0.0086117" />
+    <nuclide name="O-16"  wo="0.0683369" />
+    <nuclide name="B-10"  wo="2.77638e-5" />
+    <nuclide name="B-11"  wo="1.26481e-4" />
+    <nuclide name="Fe-54" wo="0.035953677186" />
+    <nuclide name="Fe-56" wo="0.585224740891" />
+    <nuclide name="Fe-57" wo="0.01375486056" />
+    <nuclide name="Fe-58" wo="0.001865821363" />
+    <nuclide name="Ni-58" wo="0.055815129186" />
+    <nuclide name="Ni-60" wo="0.022240333032" />
+    <nuclide name="Ni-61" wo="0.000982608081" />
+    <nuclide name="Ni-62" wo="0.003185377845" />
+    <nuclide name="Ni-64" wo="0.000837251856" />
+    <nuclide name="Mn-55" wo="0.0184579" />
+    <nuclide name="Si-28" wo="0.00847831314" />
+    <nuclide name="Si-29" wo="0.00044612986" />
+    <nuclide name="Si-30" wo="0.000304557" />
+    <nuclide name="Cr-50" wo="0.00731912987" />
+    <nuclide name="Cr-52" wo="0.146766614995" />
+    <nuclide name="Cr-53" wo="0.01696340737" />
+    <nuclide name="Cr-54" wo="0.004301347765" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+  <!-- Bottom plate region -->
+  <material id="8">
+    <density value="7.184" units="g/cm3" />
+    <nuclide name="H-1"   wo="0.0011505" />
+    <nuclide name="O-16"  wo="0.0091296" />
+    <nuclide name="B-10"  wo="3.70915e-6" />
+    <nuclide name="B-11"  wo="1.68974e-5" />
+    <nuclide name="Fe-54" wo="0.03855611055" />
+    <nuclide name="Fe-56" wo="0.627585036425" />
+    <nuclide name="Fe-57" wo="0.014750478" />
+    <nuclide name="Fe-58" wo="0.002000875025" />
+    <nuclide name="Ni-58" wo="0.059855207342" />
+    <nuclide name="Ni-60" wo="0.023850159704" />
+    <nuclide name="Ni-61" wo="0.001053732407" />
+    <nuclide name="Ni-62" wo="0.003415945715" />
+    <nuclide name="Ni-64" wo="0.000897854832" />
+    <nuclide name="Mn-55" wo="0.0197940" />
+    <nuclide name="Si-28" wo="0.00909197802" />
+    <nuclide name="Si-29" wo="0.00047842098" />
+    <nuclide name="Si-30" wo="0.000326601" />
+    <nuclide name="Cr-50" wo="0.007848910646" />
+    <nuclide name="Cr-52" wo="0.157390026871" />
+    <nuclide name="Cr-53" wo="0.018191270146" />
+    <nuclide name="Cr-54" wo="0.004612692337" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+  <!-- Bottom nozzle region -->
+  <material id="9">
+    <density value="2.53" units="g/cm3" />
+    <nuclide name="H-1"   wo="0.0245014" />
+    <nuclide name="O-16"  wo="0.1944274" />
+    <nuclide name="B-10"  wo="7.89917e-5" />
+    <nuclide name="B-11"  wo="3.59854e-4" />
+    <nuclide name="Fe-54" wo="0.030411411144" />
+    <nuclide name="Fe-56" wo="0.495012237964" />
+    <nuclide name="Fe-57" wo="0.01163454624" />
+    <nuclide name="Fe-58" wo="0.001578204652" />
+    <nuclide name="Ni-58" wo="0.047211231662" />
+    <nuclide name="Ni-60" wo="0.018811987544" />
+    <nuclide name="Ni-61" wo="0.000831139127" />
+    <nuclide name="Ni-62" wo="0.002694352115" />
+    <nuclide name="Ni-64" wo="0.000708189552" />
+    <nuclide name="Mn-55" wo="0.0156126" />
+    <nuclide name="Si-28" wo="0.007171335558" />
+    <nuclide name="Si-29" wo="0.000377356542" />
+    <nuclide name="Si-30" wo="0.0002576079" />
+    <nuclide name="Cr-50" wo="0.006190885148" />
+    <nuclide name="Cr-52" wo="0.124142524198" />
+    <nuclide name="Cr-53" wo="0.014348496148" />
+    <nuclide name="Cr-54" wo="0.003638294506" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+  <!-- Top nozzle region -->
+  <material id="10">
+    <density value="1.746" units="g/cm3" />
+    <nuclide name="H-1"   wo="0.0358870" />
+    <nuclide name="O-16"  wo="0.2847761" />
+    <nuclide name="B-10"  wo="1.15699e-4" />
+    <nuclide name="B-11"  wo="5.27075e-4" />
+    <nuclide name="Fe-54" wo="0.02644016154" />
+    <nuclide name="Fe-56" wo="0.43037146399" />
+    <nuclide name="Fe-57" wo="0.0101152584" />
+    <nuclide name="Fe-58" wo="0.00137211607" />
+    <nuclide name="Ni-58" wo="0.04104621835" />
+    <nuclide name="Ni-60" wo="0.0163554502" />
+    <nuclide name="Ni-61" wo="0.000722605975" />
+    <nuclide name="Ni-62" wo="0.002342513875" />
+    <nuclide name="Ni-64" wo="0.0006157116" />
+    <nuclide name="Mn-55" wo="0.0135739" />
+    <nuclide name="Si-28" wo="0.006234853554" />
+    <nuclide name="Si-29" wo="0.000328078746" />
+    <nuclide name="Si-30" wo="0.0002239677" />
+    <nuclide name="Cr-50" wo="0.005382452306" />
+    <nuclide name="Cr-52" wo="0.107931450781" />
+    <nuclide name="Cr-53" wo="0.012474806806" />
+    <nuclide name="Cr-54" wo="0.003163190107" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+  <!-- Top of Fuel Assemblies -->
+  <material id="11">
+    <density value="3.044" units="g/cm3" />
+    <nuclide name="H-1"   wo="0.0162913" />
+    <nuclide name="O-16"  wo="0.1292776" />
+    <nuclide name="B-10"  wo="5.25228e-5" />
+    <nuclide name="B-11"  wo="2.39272e-4" />
+    <nuclide name="Zr-90" wo="0.43313403903" />
+    <nuclide name="Zr-91" wo="0.09549277374" />
+    <nuclide name="Zr-92" wo="0.14759527104" />
+    <nuclide name="Zr-94" wo="0.15280552077" />
+    <nuclide name="Zr-96" wo="0.02511169542" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+  <!-- Bottom of Fuel Assemblies -->
+  <material id="12">
+    <density value="1.762" units="g/cm3" />
+    <nuclide name="H-1"   wo="0.0292856" />
+    <nuclide name="O-16"  wo="0.2323919" />
+    <nuclide name="B-10"  wo="9.44159e-5" />
+    <nuclide name="B-11"  wo="4.30120e-4" />
+    <nuclide name="Zr-90" wo="0.3741373658" />
+    <nuclide name="Zr-91" wo="0.0824858164" />
+    <nuclide name="Zr-92" wo="0.1274914944" />
+    <nuclide name="Zr-94" wo="0.1319920622" />
+    <nuclide name="Zr-96" wo="0.0216912612" />
+    <sab name="HH2O" xs="71t" />
+  </material>
+
+</materials>
diff --git a/tests/test_many_scores/results.py b/tests/test_many_scores/results.py
new file mode 100644
index 0000000000..79b9e806e5
--- /dev/null
+++ b/tests/test_many_scores/results.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+import sys
+import numpy as np
+
+sys.path.insert(0, '../..')
+from openmc.statepoint import StatePoint
+
+# read in statepoint file
+if len(sys.argv) > 1:
+    sp = StatePoint(sys.argv[1])
+else:
+    sp = StatePoint('statepoint.10.binary')
+
+sp.read_results()
+
+# extract tally results and convert to vector
+tally1 = sp._tallies[1]
+results1 = np.zeros((tally1._sum.size + tally1._sum.size, ))
+results1[0::2] = tally1._sum.ravel()
+results1[1::2] = tally1._sum_sq.ravel()
+
+# set up output string
+outstr = ''
+
+# write out k-combined
+outstr += 'k-combined:\n'
+outstr += "{0:12.6E} {1:12.6E}\n".format(sp._k_combined[0], sp._k_combined[1])
+
+# write out tally results
+outstr += 'tally 1:\n'
+for item in results1:
+  outstr += "{0:12.6E}\n".format(item)
+
+# write results to file
+with open('results_test.dat','w') as fh:
+    fh.write(outstr)
diff --git a/tests/test_many_scores/results_true.dat b/tests/test_many_scores/results_true.dat
new file mode 100644
index 0000000000..a942298579
--- /dev/null
+++ b/tests/test_many_scores/results_true.dat
@@ -0,0 +1,111 @@
+k-combined:
+1.093844E+00 1.626801E-02
+tally 1:
+3.279262E+01
+2.221651E+02
+1.467000E+01
+4.436530E+01
+1.238000E+01
+3.168320E+01
+1.239000E+01
+3.172630E+01
+6.199204E-01
+1.441510E-01
+1.238000E+01
+3.168320E+01
+1.437080E+00
+4.234943E-01
+6.199204E-01
+1.441510E-01
+6.192790E-01
+1.440589E-01
+1.239000E+01
+3.172630E+01
+1.431689E+00
+4.209133E-01
+6.192790E-01
+1.440589E-01
+1.299248E+01
+3.535385E+01
+1.237000E+01
+3.164030E+01
+2.290000E+00
+1.070700E+00
+2.621040E+00
+1.432626E+00
+2.121307E+02
+9.243355E+03
+3.279262E+01
+2.221651E+02
+7.953554E-01
+2.794413E-01
+-5.651323E-01
+5.451242E-01
+7.808576E-01
+4.643154E-01
+-3.339898E-02
+2.214820E-01
+8.240703E-01
+3.604286E-01
+-3.480671E-01
+5.570757E-02
+9.439222E-02
+1.270253E-01
+-7.433958E-02
+2.442051E-01
+1.467000E+01
+4.436530E+01
+2.078102E-01
+7.212449E-02
+-2.504352E-01
+6.843464E-02
+2.485680E-01
+5.434798E-02
+1.706243E-02
+3.852278E-02
+3.951701E-01
+4.706380E-02
+-1.535042E-01
+6.678803E-03
+-1.897513E-02
+2.508393E-02
+-6.471447E-02
+3.180139E-02
+1.238000E+01
+3.168320E+01
+-1.570048E-01
+1.067590E-02
+-4.730723E-02
+2.307294E-02
+6.490976E-02
+1.426908E-02
+-2.426427E-02
+5.909294E-03
+9.534163E-02
+6.333588E-03
+-1.023123E-02
+2.132217E-03
+-2.609941E-03
+2.406916E-03
+1.035322E-01
+1.128320E-02
+1.239000E+01
+3.172630E+01
+-1.558408E-01
+1.069360E-02
+-4.768057E-02
+2.298561E-02
+7.015981E-02
+1.366523E-02
+-2.449791E-02
+5.899048E-03
+9.535825E-02
+6.335188E-03
+-9.915129E-03
+2.116965E-03
+-2.535001E-03
+2.410993E-03
+1.030312E-01
+1.128648E-02
+1.458000E+01
+4.391620E+01
diff --git a/tests/test_many_scores/settings.xml b/tests/test_many_scores/settings.xml
new file mode 100644
index 0000000000..517637a59f
--- /dev/null
+++ b/tests/test_many_scores/settings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<settings>
+
+  <eigenvalue>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <particles>100</particles>
+  </eigenvalue>
+
+  <source>
+    <space type="box">
+      <parameters>
+        -160 -160 -183
+         160  160  183
+      </parameters>
+    </space>
+  </source>
+
+</settings>
diff --git a/tests/test_many_scores/tallies.xml b/tests/test_many_scores/tallies.xml
new file mode 100644
index 0000000000..1832acf67a
--- /dev/null
+++ b/tests/test_many_scores/tallies.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<tallies>
+
+  <tally id="1">
+    <filter type="cell" bins="21" />
+    <scores>
+      flux total scatter nu-scatter scatter-2 scatter-p2 nu-scatter-2
+      nu-scatter-p2 transport n1n absorption nu-fission kappa-fission
+      flux-y2 total-y2 scatter-y2 nu-scatter-y2 events
+    </scores>
+  </tally>
+
+</tallies>
diff --git a/tests/test_many_scores/test_many_scores.py b/tests/test_many_scores/test_many_scores.py
new file mode 100644
index 0000000000..fd3b3ed5b2
--- /dev/null
+++ b/tests/test_many_scores/test_many_scores.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+
+import os
+import sys
+from subprocess import Popen, STDOUT, PIPE, call
+import filecmp
+import glob
+from optparse import OptionParser
+
+parser = OptionParser()
+parser.add_option('--mpi_exec', dest='mpi_exec', default='')
+parser.add_option('--mpi_np', dest='mpi_np', default='3')
+parser.add_option('--exe', dest='exe')
+(opts, args) = parser.parse_args()
+cwd = os.getcwd()
+
+def test_run():
+    if opts.mpi_exec != '':
+        proc = Popen([opts.mpi_exec, '-np', opts.mpi_np, opts.exe, cwd],
+               stderr=STDOUT, stdout=PIPE)
+    else:
+        proc = Popen([opts.exe, cwd], stderr=STDOUT, stdout=PIPE)
+    print(proc.communicate()[0])
+    returncode = proc.returncode
+    assert returncode == 0, 'OpenMC did not exit successfully.'
+
+def test_created_statepoint():
+    statepoint = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
+    assert len(statepoint) == 1, 'Either multiple or no statepoint files exist.'
+    assert statepoint[0].endswith('binary') or statepoint[0].endswith('h5'),\
+        'Statepoint file is not a binary or hdf5 file.'
+
+def test_output_exists():
+    assert os.path.exists(os.path.join(cwd, 'tallies.out')), 'Tally output file does not exist.'
+
+def test_results():
+    statepoint = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
+    call([sys.executable, 'results.py', statepoint[0]])
+    compare = filecmp.cmp('results_test.dat', 'results_true.dat')
+    if not compare:
+      os.rename('results_test.dat', 'results_error.dat')
+    assert compare, 'Results do not agree.'
+
+def teardown():
+    output = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
+    output.append(os.path.join(cwd, 'tallies.out'))
+    output.append(os.path.join(cwd, 'results_test.dat'))
+    for f in output:
+        if os.path.exists(f):
+            os.remove(f)
+
+if __name__ == '__main__':
+
+    # test for openmc executable
+    if opts.exe is None:
+        raise Exception('Must specify OpenMC executable from command line with --exe.')
+
+    # run tests
+    test_run()
+    test_created_statepoint()
+    test_output_exists()
+    test_results()
+    teardown()

From adcd8bb20cc47b99b2ffede0fadbd2d254ab8fff Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Fri, 12 Jun 2015 00:34:05 -0600
Subject: [PATCH 3/4] Minor test adjustments for #399

---
 tests/test_many_scores/results.py          |   2 +-
 tests/test_many_scores/results_true.dat    | 218 ++++++++++-----------
 tests/test_many_scores/settings.xml        |   6 +-
 tests/test_many_scores/test_many_scores.py |  20 +-
 4 files changed, 124 insertions(+), 122 deletions(-)

diff --git a/tests/test_many_scores/results.py b/tests/test_many_scores/results.py
index 79b9e806e5..8214d394c6 100644
--- a/tests/test_many_scores/results.py
+++ b/tests/test_many_scores/results.py
@@ -10,7 +10,7 @@ from openmc.statepoint import StatePoint
 if len(sys.argv) > 1:
     sp = StatePoint(sys.argv[1])
 else:
-    sp = StatePoint('statepoint.10.binary')
+    sp = StatePoint('statepoint.5.binary')
 
 sp.read_results()
 
diff --git a/tests/test_many_scores/results_true.dat b/tests/test_many_scores/results_true.dat
index a942298579..50040117df 100644
--- a/tests/test_many_scores/results_true.dat
+++ b/tests/test_many_scores/results_true.dat
@@ -1,111 +1,111 @@
 k-combined:
-1.093844E+00 1.626801E-02
+0.000000E+00 0.000000E+00
 tally 1:
-3.279262E+01
-2.221651E+02
-1.467000E+01
-4.436530E+01
-1.238000E+01
-3.168320E+01
-1.239000E+01
-3.172630E+01
-6.199204E-01
-1.441510E-01
-1.238000E+01
-3.168320E+01
-1.437080E+00
-4.234943E-01
-6.199204E-01
-1.441510E-01
-6.192790E-01
-1.440589E-01
-1.239000E+01
-3.172630E+01
-1.431689E+00
-4.209133E-01
-6.192790E-01
-1.440589E-01
-1.299248E+01
-3.535385E+01
-1.237000E+01
-3.164030E+01
-2.290000E+00
-1.070700E+00
-2.621040E+00
-1.432626E+00
-2.121307E+02
-9.243355E+03
-3.279262E+01
-2.221651E+02
-7.953554E-01
-2.794413E-01
--5.651323E-01
-5.451242E-01
-7.808576E-01
-4.643154E-01
--3.339898E-02
-2.214820E-01
-8.240703E-01
-3.604286E-01
--3.480671E-01
-5.570757E-02
-9.439222E-02
-1.270253E-01
--7.433958E-02
-2.442051E-01
-1.467000E+01
-4.436530E+01
-2.078102E-01
-7.212449E-02
--2.504352E-01
-6.843464E-02
-2.485680E-01
-5.434798E-02
-1.706243E-02
-3.852278E-02
-3.951701E-01
-4.706380E-02
--1.535042E-01
-6.678803E-03
--1.897513E-02
-2.508393E-02
--6.471447E-02
-3.180139E-02
-1.238000E+01
-3.168320E+01
--1.570048E-01
-1.067590E-02
--4.730723E-02
-2.307294E-02
-6.490976E-02
-1.426908E-02
--2.426427E-02
-5.909294E-03
-9.534163E-02
-6.333588E-03
--1.023123E-02
-2.132217E-03
--2.609941E-03
-2.406916E-03
-1.035322E-01
-1.128320E-02
-1.239000E+01
-3.172630E+01
--1.558408E-01
-1.069360E-02
--4.768057E-02
-2.298561E-02
-7.015981E-02
-1.366523E-02
--2.449791E-02
-5.899048E-03
-9.535825E-02
-6.335188E-03
--9.915129E-03
-2.116965E-03
--2.535001E-03
-2.410993E-03
-1.030312E-01
-1.128648E-02
-1.458000E+01
-4.391620E+01
+2.254760E+01
+1.695439E+02
+1.017400E+01
+3.450623E+01
+8.690000E+00
+2.517771E+01
+8.696000E+00
+2.521248E+01
+5.224881E-01
+9.127522E-02
+8.690000E+00
+2.517771E+01
+9.665236E-01
+3.121401E-01
+5.224881E-01
+9.127522E-02
+5.199964E-01
+9.041516E-02
+8.696000E+00
+2.521248E+01
+9.666447E-01
+3.122176E-01
+5.199964E-01
+9.041516E-02
+9.262308E+00
+2.859762E+01
+8.684000E+00
+2.514296E+01
+1.484000E+00
+7.346160E-01
+1.804688E+00
+1.089100E+00
+1.334833E+02
+5.960573E+03
+2.254760E+01
+1.695439E+02
+-6.230152E-02
+1.023784E-02
+-2.696818E-01
+8.525477E-02
+-1.670294E-01
+4.366614E-02
+1.331953E-02
+8.064039E-05
+-2.490295E-01
+2.511425E-02
+8.289978E-02
+2.753446E-03
+-1.390686E-01
+1.592673E-02
+1.600203E-01
+1.344513E-02
+1.017400E+01
+3.450623E+01
+-6.564301E-02
+2.564587E-03
+-1.245391E-01
+1.143479E-02
+-5.550309E-02
+9.334547E-03
+4.671277E-02
+1.795787E-03
+-9.901000E-02
+4.609654E-03
+2.619012E-02
+3.011793E-04
+-7.090362E-02
+2.450750E-03
+4.059073E-02
+8.841300E-04
+8.690000E+00
+2.517771E+01
+-2.685052E-02
+2.769798E-04
+4.047919E-03
+3.384947E-03
+-1.325869E-01
+8.610169E-03
+-1.594962E-02
+5.528670E-04
+-1.320550E-02
+1.856248E-04
+1.185337E-02
+3.428536E-04
+2.622196E-02
+3.774884E-04
+2.938463E-02
+6.660370E-04
+8.696000E+00
+2.521248E+01
+-2.634867E-02
+2.718345E-04
+4.042613E-03
+3.367272E-03
+-1.328903E-01
+8.576852E-03
+-1.632965E-02
+5.577169E-04
+-1.408565E-02
+1.815109E-04
+1.202519E-02
+3.685250E-04
+2.634054E-02
+3.730853E-04
+2.941341E-02
+6.479457E-04
+8.662000E+00
+2.501365E+01
diff --git a/tests/test_many_scores/settings.xml b/tests/test_many_scores/settings.xml
index 517637a59f..08dc0d2e12 100644
--- a/tests/test_many_scores/settings.xml
+++ b/tests/test_many_scores/settings.xml
@@ -2,9 +2,9 @@
 <settings>
 
   <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>2</inactive>
+    <particles>500</particles>
   </eigenvalue>
 
   <source>
diff --git a/tests/test_many_scores/test_many_scores.py b/tests/test_many_scores/test_many_scores.py
index fd3b3ed5b2..6b3ddeccae 100644
--- a/tests/test_many_scores/test_many_scores.py
+++ b/tests/test_many_scores/test_many_scores.py
@@ -25,7 +25,7 @@ def test_run():
     assert returncode == 0, 'OpenMC did not exit successfully.'
 
 def test_created_statepoint():
-    statepoint = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
+    statepoint = glob.glob(os.path.join(cwd, 'statepoint.5.*'))
     assert len(statepoint) == 1, 'Either multiple or no statepoint files exist.'
     assert statepoint[0].endswith('binary') or statepoint[0].endswith('h5'),\
         'Statepoint file is not a binary or hdf5 file.'
@@ -34,15 +34,15 @@ def test_output_exists():
     assert os.path.exists(os.path.join(cwd, 'tallies.out')), 'Tally output file does not exist.'
 
 def test_results():
-    statepoint = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
+    statepoint = glob.glob(os.path.join(cwd, 'statepoint.5.*'))
     call([sys.executable, 'results.py', statepoint[0]])
     compare = filecmp.cmp('results_test.dat', 'results_true.dat')
     if not compare:
-      os.rename('results_test.dat', 'results_error.dat')
+        os.rename('results_test.dat', 'results_error.dat')
     assert compare, 'Results do not agree.'
 
 def teardown():
-    output = glob.glob(os.path.join(cwd, 'statepoint.10.*'))
+    output = glob.glob(os.path.join(cwd, 'statepoint.5.*'))
     output.append(os.path.join(cwd, 'tallies.out'))
     output.append(os.path.join(cwd, 'results_test.dat'))
     for f in output:
@@ -56,8 +56,10 @@ if __name__ == '__main__':
         raise Exception('Must specify OpenMC executable from command line with --exe.')
 
     # run tests
-    test_run()
-    test_created_statepoint()
-    test_output_exists()
-    test_results()
-    teardown()
+    try:
+        test_run()
+        test_created_statepoint()
+        test_output_exists()
+        test_results()
+    finally:
+        teardown()

From 38d1761335df5c69c1a26d09b71d00846be56d21 Mon Sep 17 00:00:00 2001
From: Sterling Harper <sterlingmharper@gmail.com>
Date: Fri, 12 Jun 2015 11:56:27 -0600
Subject: [PATCH 4/4] Fixed tests for #399

---
 tests/test_many_scores/results_true.dat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_many_scores/results_true.dat b/tests/test_many_scores/results_true.dat
index 50040117df..191122f13e 100644
--- a/tests/test_many_scores/results_true.dat
+++ b/tests/test_many_scores/results_true.dat
@@ -107,5 +107,5 @@ tally 1:
 3.730853E-04
 2.941341E-02
 6.479457E-04
-8.662000E+00
-2.501365E+01
+1.014000E+01
+3.427460E+01