From a0a07e2550a82f2a69d5ec2b5760bf150808df73 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Tue, 13 Oct 2015 11:13:20 -0400
Subject: [PATCH 1/6] Fixed bug with triggers on tallies with multiple filters.
 Fixed bug when using triggers with tally score moments

---
 openmc/trigger.py | 15 +++++++++++++++
 src/trigger.F90   | 23 +----------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/openmc/trigger.py b/openmc/trigger.py
index e695defde..0652834b8 100644
--- a/openmc/trigger.py
+++ b/openmc/trigger.py
@@ -1,6 +1,7 @@
 from numbers import Real
 from xml.etree import ElementTree as ET
 import sys
+import re
 
 from openmc.checkvalue import check_type, check_value
 
@@ -96,6 +97,20 @@ class Trigger(object):
                   'it is not a string'.format(score)
             raise ValueError(msg)
 
+        # If this is a scattering moment, use generic moment order
+        regexp = re.compile(r'-[0-9]')
+        if regexp.search(score) is not None:
+            score = score.strip(regexp.findall(score)[0])
+            score += '-n'
+        regexp = re.compile(r'-[p|P][0-9]')
+        if regexp.search(score) is not None:
+            score = score.strip(regexp.findall(score)[0])
+            score += '-pn'
+        regexp = re.compile(r'-[y|Y][0-9]')
+        if regexp.search(score) is not None:
+            score = score.strip(regexp.findall(score)[0])
+            score += '-yn'
+
         # If the score is already in the Tally, don't add it again
         if score in self._scores:
             return
diff --git a/src/trigger.F90 b/src/trigger.F90
index a74a64be0..73cb0c7ef 100644
--- a/src/trigger.F90
+++ b/src/trigger.F90
@@ -92,7 +92,6 @@ contains
     character(len=52), intent(inout) :: name  ! "eigenvalue" or tally score
 
     integer :: i              ! index in tallies array
-    integer :: j              ! level in tally hierarchy
     integer :: n              ! loop index for nuclides
     integer :: s              ! loop index for triggers
     integer :: filter_index   ! index in results array for filters
@@ -167,28 +166,8 @@ contains
 
             ! Initialize bins, filter level
             matching_bins(1:t % n_filters) = 0
-            j = 1
 
-            ! Find filter index
-            FILTER_LOOP: do
-              find_bin: do
-                if (t % n_filters == 0) exit find_bin
-                matching_bins(j) = matching_bins(j) + 1
-                if (matching_bins(j) > t % filters(j) % n_bins) then
-                  if (j == 1) exit FILTER_LOOP
-                  matching_bins(j) = 0
-                  j = j - 1
-                else
-                  if (j == t % n_filters) exit find_bin
-                end if
-              end do find_bin
-
-              if (t % n_filters > 0) then
-                filter_index = sum((max(matching_bins(1:t%n_filters),1) - 1) * &
-                     t % stride) + 1
-              else
-                filter_index = 1
-              end if
+            FILTER_LOOP: do filter_index = 1, t % total_filter_bins
 
               ! Initialize score index
               score_index = trigger % score_index

From 7173431d6bae3015fe8dc20e17cf425950e01f09 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Tue, 20 Oct 2015 23:33:26 -0400
Subject: [PATCH 2/6] Fixed comment in trigger.py for scattering moment regular
 expressions

---
 openmc/trigger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmc/trigger.py b/openmc/trigger.py
index 0652834b8..4019d5d46 100644
--- a/openmc/trigger.py
+++ b/openmc/trigger.py
@@ -97,7 +97,7 @@ class Trigger(object):
                   'it is not a string'.format(score)
             raise ValueError(msg)
 
-        # If this is a scattering moment, use generic moment order
+        # If this is a total/flux/scattering moment, use generic moment order
         regexp = re.compile(r'-[0-9]')
         if regexp.search(score) is not None:
             score = score.strip(regexp.findall(score)[0])

From 4089d6fb38c86179ebda9bfc6761b06d2df16454 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Sat, 24 Oct 2015 09:12:44 -0400
Subject: [PATCH 3/6] Put h5py import in Tally.sum property getter to make it
 an optional dependency for Python API

---
 openmc/tallies.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmc/tallies.py b/openmc/tallies.py
index 5b6937107..5c78b9d86 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -8,7 +8,6 @@ from xml.etree import ElementTree as ET
 import sys
 
 import numpy as np
-import h5py
 
 from openmc import Mesh, Filter, Trigger, Nuclide
 from openmc.cross import CrossScore, CrossNuclide, CrossFilter
@@ -269,6 +268,7 @@ class Tally(object):
             return None
 
         if not self._results_read:
+            import h5py
 
             # Open the HDF5 statepoint file
             f = h5py.File(self._sp_filename, 'r')

From 0fa75f293bb848c81dea309272720d780a5a4ef0 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Sat, 24 Oct 2015 10:04:19 -0400
Subject: [PATCH 4/6] Updated tally trigger score name key dictionary storage
 per recommendation by @paulromano

---
 openmc/trigger.py                             |  14 -
 src/input_xml.F90                             |   9 +-
 tests/test_score_nuscatter_yn/geometry.xml    | 148 +++++++++++
 tests/test_score_nuscatter_yn/inputs_test.dat |   1 +
 tests/test_score_nuscatter_yn/materials.xml   | 246 ++++++++++++++++++
 tests/test_score_nuscatter_yn/settings.xml    |  13 +
 tests/test_score_nuscatter_yn/tallies.xml     |  11 +
 7 files changed, 424 insertions(+), 18 deletions(-)
 create mode 100644 tests/test_score_nuscatter_yn/geometry.xml
 create mode 100644 tests/test_score_nuscatter_yn/inputs_test.dat
 create mode 100644 tests/test_score_nuscatter_yn/materials.xml
 create mode 100644 tests/test_score_nuscatter_yn/settings.xml
 create mode 100644 tests/test_score_nuscatter_yn/tallies.xml

diff --git a/openmc/trigger.py b/openmc/trigger.py
index 4019d5d46..9c7c66034 100644
--- a/openmc/trigger.py
+++ b/openmc/trigger.py
@@ -97,20 +97,6 @@ class Trigger(object):
                   'it is not a string'.format(score)
             raise ValueError(msg)
 
-        # If this is a total/flux/scattering moment, use generic moment order
-        regexp = re.compile(r'-[0-9]')
-        if regexp.search(score) is not None:
-            score = score.strip(regexp.findall(score)[0])
-            score += '-n'
-        regexp = re.compile(r'-[p|P][0-9]')
-        if regexp.search(score) is not None:
-            score = score.strip(regexp.findall(score)[0])
-            score += '-pn'
-        regexp = re.compile(r'-[y|Y][0-9]')
-        if regexp.search(score) is not None:
-            score = score.strip(regexp.findall(score)[0])
-            score += '-yn'
-
         # If the score is already in the Tally, don't add it again
         if score in self._scores:
             return
diff --git a/src/input_xml.F90 b/src/input_xml.F90
index 6d15f0d20..debe1309a 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -2796,6 +2796,10 @@ contains
           ! MOMENT_STRS(:)
           ! If so, check the order, store if OK, then reset the number to 'n'
           score_name = trim(sarray(j))
+
+          ! Append the score to the list of possible trigger scores
+          if (trigger_on) call trigger_scores % add_key(trim(score_name), j)
+
           do imomstr = 1, size(MOMENT_STRS)
             if (starts_with(score_name,trim(MOMENT_STRS(imomstr)))) then
               n_order_pos = scan(score_name,'0123456789')
@@ -3196,11 +3200,8 @@ contains
             end if
 
           end select
-
-          ! Append the score to the list of possible trigger scores
-          if (trigger_on) call trigger_scores % add_key(trim(score_name), l)
-
         end do
+
         t % n_score_bins = n_scores
         t % n_user_score_bins = n_words
 
diff --git a/tests/test_score_nuscatter_yn/geometry.xml b/tests/test_score_nuscatter_yn/geometry.xml
new file mode 100644
index 000000000..ed66ef8e6
--- /dev/null
+++ b/tests/test_score_nuscatter_yn/geometry.xml
@@ -0,0 +1,148 @@
+<?xml version='1.0' encoding='utf-8'?>
+<geometry>
+    <cell fill="200" id="1" region="((-6 34) -35)" universe="0" />
+    <cell id="10" material="5" region="(((7 -8) 31) -39)" universe="0" />
+    <cell id="11" material="6" region="(((5 -6) 32) -34)" universe="0" />
+    <cell id="12" material="7" region="(((5 -6) 36) -38)" universe="0" />
+    <cell fill="201" id="2" region="((-6 35) -36)" universe="0" />
+    <cell id="21" material="1" region="-1" universe="1" />
+    <cell id="22" material="2" region="(1 -2)" universe="1" />
+    <cell id="23" material="3" region="2" universe="1" />
+    <cell id="24" material="3" region="-3" universe="2" />
+    <cell id="25" material="2" region="(3 -4)" universe="2" />
+    <cell id="26" material="3" region="4" universe="2" />
+    <cell id="27" material="1" region="-1" universe="3" />
+    <cell id="28" material="2" region="(1 -2)" universe="3" />
+    <cell id="29" material="4" region="2" universe="3" />
+    <cell id="3" material="8" region="((-7 31) -32)" universe="0" />
+    <cell id="30" material="4" region="-3" universe="4" />
+    <cell id="31" material="2" region="(3 -4)" universe="4" />
+    <cell id="32" material="4" region="4" universe="4" />
+    <cell id="4" material="9" region="((-5 32) -33)" universe="0" />
+    <cell id="5" material="12" region="((-5 33) -34)" universe="0" />
+    <cell id="50" material="3" region="(34 -35)" universe="5" />
+    <cell id="6" material="11" region="((-5 36) -37)" universe="0" />
+    <cell fill="100" id="60" region="(34 -35)" universe="6" />
+    <cell id="7" material="10" region="((-5 37) -38)" universe="0" />
+    <cell id="70" material="4" region="(35 -36)" universe="7" />
+    <cell id="8" material="7" region="((-7 38) -39)" universe="0" />
+    <cell fill="101" id="80" region="(35 -36)" universe="8" />
+    <cell id="9" material="9" region="(((6 -7) 32) -38)" universe="0" />
+    <lattice id="100" name="Fuel assembly (lower half)">
+        <pitch>1.26 1.26</pitch>
+        <dimension>17 17</dimension>
+        <lower_left>-10.71 -10.71</lower_left>
+        <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>
+    <lattice id="101" name="Fuel assembly (upper half)">
+        <pitch>1.26 1.26</pitch>
+        <dimension>17 17</dimension>
+        <lower_left>-10.71 -10.71</lower_left>
+        <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>
+    <lattice id="200" name="Core lattice (lower half)">
+        <pitch>21.42 21.42</pitch>
+        <dimension>21 21</dimension>
+        <lower_left>-224.91 -224.91</lower_left>
+        <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>
+    <lattice id="201" name="Core lattice (lower half)">
+        <pitch>21.42 21.42</pitch>
+        <dimension>21 21</dimension>
+        <lower_left>-224.91 -224.91</lower_left>
+        <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>
+    <surface boundary="transmission" coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
+    <surface boundary="transmission" coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
+    <surface boundary="transmission" coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
+    <surface boundary="transmission" coeffs="-199.0" id="32" type="z-plane" />
+    <surface boundary="transmission" coeffs="-193.0" id="33" type="z-plane" />
+    <surface boundary="transmission" coeffs="-183.0" id="34" type="z-plane" />
+    <surface boundary="transmission" coeffs="0.0" id="35" type="z-plane" />
+    <surface boundary="transmission" coeffs="183.0" id="36" type="z-plane" />
+    <surface boundary="transmission" coeffs="203.0" id="37" type="z-plane" />
+    <surface boundary="transmission" coeffs="215.0" id="38" type="z-plane" />
+    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
+    <surface boundary="transmission" coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
+    <surface boundary="transmission" coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
+    <surface boundary="transmission" coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
+    <surface boundary="transmission" coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
+    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
+</geometry>
diff --git a/tests/test_score_nuscatter_yn/inputs_test.dat b/tests/test_score_nuscatter_yn/inputs_test.dat
new file mode 100644
index 000000000..632a14403
--- /dev/null
+++ b/tests/test_score_nuscatter_yn/inputs_test.dat
@@ -0,0 +1 @@
+205e5cac8129797b815f0e79dad6c41a1876157ba69fcffecf67c3603dc36ded5f0168f9961d51fcb7dc7db6d732e7a3e8f82d04947aa0309df56bb8333d4bc9
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_yn/materials.xml b/tests/test_score_nuscatter_yn/materials.xml
new file mode 100644
index 000000000..9454c0d8e
--- /dev/null
+++ b/tests/test_score_nuscatter_yn/materials.xml
@@ -0,0 +1,246 @@
+<?xml version='1.0' encoding='utf-8'?>
+<materials>
+    <default_xs>71c</default_xs>
+    <material id="1" name="Fuel">
+        <density units="g/cm3" value="10.062" />
+        <nuclide ao="4.9476e-06" name="U-234" />
+        <nuclide ao="0.00048218" name="U-235" />
+        <nuclide ao="9.0402e-05" name="U-236" />
+        <nuclide ao="0.021504" name="U-238" />
+        <nuclide ao="7.3733e-06" name="Np-237" />
+        <nuclide ao="1.5148e-06" name="Pu-238" />
+        <nuclide ao="0.00013955" name="Pu-239" />
+        <nuclide ao="3.4405e-05" name="Pu-240" />
+        <nuclide ao="2.1439e-05" name="Pu-241" />
+        <nuclide ao="3.7422e-06" name="Pu-242" />
+        <nuclide ao="4.5041e-07" name="Am-241" />
+        <nuclide ao="9.2301e-09" name="Am-242m" />
+        <nuclide ao="4.7878e-07" name="Am-243" />
+        <nuclide ao="1.0485e-07" name="Cm-242" />
+        <nuclide ao="1.4268e-09" name="Cm-243" />
+        <nuclide ao="8.8756e-08" name="Cm-244" />
+        <nuclide ao="3.5285e-09" name="Cm-245" />
+        <nuclide ao="2.6497e-05" name="Mo-95" />
+        <nuclide ao="3.2772e-05" name="Tc-99" />
+        <nuclide ao="3.0742e-05" name="Ru-101" />
+        <nuclide ao="2.3505e-06" name="Ru-103" />
+        <nuclide ao="2.0009e-06" name="Ag-109" />
+        <nuclide ao="1.0801e-08" name="Xe-135" />
+        <nuclide ao="3.4612e-05" name="Cs-133" />
+        <nuclide ao="2.6078e-05" name="Nd-143" />
+        <nuclide ao="1.9898e-05" name="Nd-145" />
+        <nuclide ao="1.6128e-06" name="Sm-147" />
+        <nuclide ao="1.1627e-07" name="Sm-149" />
+        <nuclide ao="7.1727e-06" name="Sm-150" />
+        <nuclide ao="5.4947e-07" name="Sm-151" />
+        <nuclide ao="3.0221e-06" name="Sm-152" />
+        <nuclide ao="2.6209e-06" name="Eu-153" />
+        <nuclide ao="1.5369e-09" name="Gd-155" />
+        <nuclide ao="0.045737" name="O-16" />
+    </material>
+    <material id="10" name="Top nozzle region">
+        <density units="g/cm3" value="1.746" />
+        <nuclide name="H-1" wo="0.035887" />
+        <nuclide name="O-16" wo="0.2847761" />
+        <nuclide name="B-10" wo="0.000115699" />
+        <nuclide name="B-11" wo="0.000527075" />
+        <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>
+    <material id="11" name="Top of fuel assemblies">
+        <density units="g/cm3" value="3.044" />
+        <nuclide name="H-1" wo="0.0162913" />
+        <nuclide name="O-16" wo="0.1292776" />
+        <nuclide name="B-10" wo="5.25228e-05" />
+        <nuclide name="B-11" wo="0.000239272" />
+        <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>
+    <material id="12" name="Bottom of fuel assemblies">
+        <density units="g/cm3" value="1.762" />
+        <nuclide name="H-1" wo="0.0292856" />
+        <nuclide name="O-16" wo="0.2323919" />
+        <nuclide name="B-10" wo="9.44159e-05" />
+        <nuclide name="B-11" wo="0.00043012" />
+        <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>
+    <material id="2" name="Cladding">
+        <density units="g/cm3" value="5.77" />
+        <nuclide ao="0.5145" name="Zr-90" />
+        <nuclide ao="0.1122" name="Zr-91" />
+        <nuclide ao="0.1715" name="Zr-92" />
+        <nuclide ao="0.1738" name="Zr-94" />
+        <nuclide ao="0.028" name="Zr-96" />
+    </material>
+    <material id="3" name="Cold borated water">
+        <density units="atom/b-cm" value="0.07416" />
+        <nuclide ao="2.0" name="H-1" />
+        <nuclide ao="1.0" name="O-16" />
+        <nuclide ao="0.000649" name="B-10" />
+        <nuclide ao="0.002689" name="B-11" />
+        <sab name="HH2O" xs="71t" />
+    </material>
+    <material id="4" name="Hot borated water">
+        <density units="atom/b-cm" value="0.06614" />
+        <nuclide ao="2.0" name="H-1" />
+        <nuclide ao="1.0" name="O-16" />
+        <nuclide ao="0.000649" name="B-10" />
+        <nuclide ao="0.002689" name="B-11" />
+        <sab name="HH2O" xs="71t" />
+    </material>
+    <material id="5" name="Reactor pressure vessel steel">
+        <density units="g/cm3" value="7.9" />
+        <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>
+    <material id="6" name="Lower radial reflector">
+        <density units="g/cm3" value="4.32" />
+        <nuclide name="H-1" wo="0.0095661" />
+        <nuclide name="O-16" wo="0.0759107" />
+        <nuclide name="B-10" wo="3.08409e-05" />
+        <nuclide name="B-11" wo="0.000140499" />
+        <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.018287" />
+        <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>
+    <material id="7" name="Upper radial reflector /Top plate region">
+        <density units="g/cm3" value="4.28" />
+        <nuclide name="H-1" wo="0.0086117" />
+        <nuclide name="O-16" wo="0.0683369" />
+        <nuclide name="B-10" wo="2.77638e-05" />
+        <nuclide name="B-11" wo="0.000126481" />
+        <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>
+    <material id="8" name="Bottom plate region">
+        <density units="g/cm3" value="7.184" />
+        <nuclide name="H-1" wo="0.0011505" />
+        <nuclide name="O-16" wo="0.0091296" />
+        <nuclide name="B-10" wo="3.70915e-06" />
+        <nuclide name="B-11" wo="1.68974e-05" />
+        <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.019794" />
+        <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>
+    <material id="9" name="Bottom nozzle region">
+        <density units="g/cm3" value="2.53" />
+        <nuclide name="H-1" wo="0.0245014" />
+        <nuclide name="O-16" wo="0.1944274" />
+        <nuclide name="B-10" wo="7.89917e-05" />
+        <nuclide name="B-11" wo="0.000359854" />
+        <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>
+</materials>
diff --git a/tests/test_score_nuscatter_yn/settings.xml b/tests/test_score_nuscatter_yn/settings.xml
new file mode 100644
index 000000000..9e514829e
--- /dev/null
+++ b/tests/test_score_nuscatter_yn/settings.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8'?>
+<settings>
+    <eigenvalue>
+        <particles>100</particles>
+        <batches>10</batches>
+        <inactive>0</inactive>
+    </eigenvalue>
+    <source>
+        <space type="box">
+            <parameters>-160 -160 -183 160 160 183</parameters>
+        </space>
+    </source>
+</settings>
diff --git a/tests/test_score_nuscatter_yn/tallies.xml b/tests/test_score_nuscatter_yn/tallies.xml
new file mode 100644
index 000000000..eeaad0829
--- /dev/null
+++ b/tests/test_score_nuscatter_yn/tallies.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tallies>
+    <tally id="1">
+        <filter bins="21" type="cell" />
+        <scores>nu-scatter-0</scores>
+    </tally>
+    <tally id="2">
+        <filter bins="21" type="cell" />
+        <scores>nu-scatter-y3</scores>
+    </tally>
+</tallies>

From f44dccca26413d2a21745c8f3ee59797659e9657 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Sat, 24 Oct 2015 10:07:36 -0400
Subject: [PATCH 5/6] Removed extraneous test inputs added by last commit

---
 tests/test_score_nuscatter_yn/geometry.xml    | 148 -----------
 tests/test_score_nuscatter_yn/inputs_test.dat |   1 -
 tests/test_score_nuscatter_yn/materials.xml   | 246 ------------------
 tests/test_score_nuscatter_yn/settings.xml    |  13 -
 tests/test_score_nuscatter_yn/tallies.xml     |  11 -
 5 files changed, 419 deletions(-)
 delete mode 100644 tests/test_score_nuscatter_yn/geometry.xml
 delete mode 100644 tests/test_score_nuscatter_yn/inputs_test.dat
 delete mode 100644 tests/test_score_nuscatter_yn/materials.xml
 delete mode 100644 tests/test_score_nuscatter_yn/settings.xml
 delete mode 100644 tests/test_score_nuscatter_yn/tallies.xml

diff --git a/tests/test_score_nuscatter_yn/geometry.xml b/tests/test_score_nuscatter_yn/geometry.xml
deleted file mode 100644
index ed66ef8e6..000000000
--- a/tests/test_score_nuscatter_yn/geometry.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<geometry>
-    <cell fill="200" id="1" region="((-6 34) -35)" universe="0" />
-    <cell id="10" material="5" region="(((7 -8) 31) -39)" universe="0" />
-    <cell id="11" material="6" region="(((5 -6) 32) -34)" universe="0" />
-    <cell id="12" material="7" region="(((5 -6) 36) -38)" universe="0" />
-    <cell fill="201" id="2" region="((-6 35) -36)" universe="0" />
-    <cell id="21" material="1" region="-1" universe="1" />
-    <cell id="22" material="2" region="(1 -2)" universe="1" />
-    <cell id="23" material="3" region="2" universe="1" />
-    <cell id="24" material="3" region="-3" universe="2" />
-    <cell id="25" material="2" region="(3 -4)" universe="2" />
-    <cell id="26" material="3" region="4" universe="2" />
-    <cell id="27" material="1" region="-1" universe="3" />
-    <cell id="28" material="2" region="(1 -2)" universe="3" />
-    <cell id="29" material="4" region="2" universe="3" />
-    <cell id="3" material="8" region="((-7 31) -32)" universe="0" />
-    <cell id="30" material="4" region="-3" universe="4" />
-    <cell id="31" material="2" region="(3 -4)" universe="4" />
-    <cell id="32" material="4" region="4" universe="4" />
-    <cell id="4" material="9" region="((-5 32) -33)" universe="0" />
-    <cell id="5" material="12" region="((-5 33) -34)" universe="0" />
-    <cell id="50" material="3" region="(34 -35)" universe="5" />
-    <cell id="6" material="11" region="((-5 36) -37)" universe="0" />
-    <cell fill="100" id="60" region="(34 -35)" universe="6" />
-    <cell id="7" material="10" region="((-5 37) -38)" universe="0" />
-    <cell id="70" material="4" region="(35 -36)" universe="7" />
-    <cell id="8" material="7" region="((-7 38) -39)" universe="0" />
-    <cell fill="101" id="80" region="(35 -36)" universe="8" />
-    <cell id="9" material="9" region="(((6 -7) 32) -38)" universe="0" />
-    <lattice id="100" name="Fuel assembly (lower half)">
-        <pitch>1.26 1.26</pitch>
-        <dimension>17 17</dimension>
-        <lower_left>-10.71 -10.71</lower_left>
-        <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>
-    <lattice id="101" name="Fuel assembly (upper half)">
-        <pitch>1.26 1.26</pitch>
-        <dimension>17 17</dimension>
-        <lower_left>-10.71 -10.71</lower_left>
-        <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>
-    <lattice id="200" name="Core lattice (lower half)">
-        <pitch>21.42 21.42</pitch>
-        <dimension>21 21</dimension>
-        <lower_left>-224.91 -224.91</lower_left>
-        <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>
-    <lattice id="201" name="Core lattice (lower half)">
-        <pitch>21.42 21.42</pitch>
-        <dimension>21 21</dimension>
-        <lower_left>-224.91 -224.91</lower_left>
-        <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>
-    <surface boundary="transmission" coeffs="0.0 0.0 0.41" id="1" type="z-cylinder" />
-    <surface boundary="transmission" coeffs="0.0 0.0 0.475" id="2" type="z-cylinder" />
-    <surface boundary="transmission" coeffs="0.0 0.0 0.56" id="3" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane" />
-    <surface boundary="transmission" coeffs="-199.0" id="32" type="z-plane" />
-    <surface boundary="transmission" coeffs="-193.0" id="33" type="z-plane" />
-    <surface boundary="transmission" coeffs="-183.0" id="34" type="z-plane" />
-    <surface boundary="transmission" coeffs="0.0" id="35" type="z-plane" />
-    <surface boundary="transmission" coeffs="183.0" id="36" type="z-plane" />
-    <surface boundary="transmission" coeffs="203.0" id="37" type="z-plane" />
-    <surface boundary="transmission" coeffs="215.0" id="38" type="z-plane" />
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane" />
-    <surface boundary="transmission" coeffs="0.0 0.0 0.62" id="4" type="z-cylinder" />
-    <surface boundary="transmission" coeffs="0.0 0.0 187.6" id="5" type="z-cylinder" />
-    <surface boundary="transmission" coeffs="0.0 0.0 209.0" id="6" type="z-cylinder" />
-    <surface boundary="transmission" coeffs="0.0 0.0 229.0" id="7" type="z-cylinder" />
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder" />
-</geometry>
diff --git a/tests/test_score_nuscatter_yn/inputs_test.dat b/tests/test_score_nuscatter_yn/inputs_test.dat
deleted file mode 100644
index 632a14403..000000000
--- a/tests/test_score_nuscatter_yn/inputs_test.dat
+++ /dev/null
@@ -1 +0,0 @@
-205e5cac8129797b815f0e79dad6c41a1876157ba69fcffecf67c3603dc36ded5f0168f9961d51fcb7dc7db6d732e7a3e8f82d04947aa0309df56bb8333d4bc9
\ No newline at end of file
diff --git a/tests/test_score_nuscatter_yn/materials.xml b/tests/test_score_nuscatter_yn/materials.xml
deleted file mode 100644
index 9454c0d8e..000000000
--- a/tests/test_score_nuscatter_yn/materials.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-    <default_xs>71c</default_xs>
-    <material id="1" name="Fuel">
-        <density units="g/cm3" value="10.062" />
-        <nuclide ao="4.9476e-06" name="U-234" />
-        <nuclide ao="0.00048218" name="U-235" />
-        <nuclide ao="9.0402e-05" name="U-236" />
-        <nuclide ao="0.021504" name="U-238" />
-        <nuclide ao="7.3733e-06" name="Np-237" />
-        <nuclide ao="1.5148e-06" name="Pu-238" />
-        <nuclide ao="0.00013955" name="Pu-239" />
-        <nuclide ao="3.4405e-05" name="Pu-240" />
-        <nuclide ao="2.1439e-05" name="Pu-241" />
-        <nuclide ao="3.7422e-06" name="Pu-242" />
-        <nuclide ao="4.5041e-07" name="Am-241" />
-        <nuclide ao="9.2301e-09" name="Am-242m" />
-        <nuclide ao="4.7878e-07" name="Am-243" />
-        <nuclide ao="1.0485e-07" name="Cm-242" />
-        <nuclide ao="1.4268e-09" name="Cm-243" />
-        <nuclide ao="8.8756e-08" name="Cm-244" />
-        <nuclide ao="3.5285e-09" name="Cm-245" />
-        <nuclide ao="2.6497e-05" name="Mo-95" />
-        <nuclide ao="3.2772e-05" name="Tc-99" />
-        <nuclide ao="3.0742e-05" name="Ru-101" />
-        <nuclide ao="2.3505e-06" name="Ru-103" />
-        <nuclide ao="2.0009e-06" name="Ag-109" />
-        <nuclide ao="1.0801e-08" name="Xe-135" />
-        <nuclide ao="3.4612e-05" name="Cs-133" />
-        <nuclide ao="2.6078e-05" name="Nd-143" />
-        <nuclide ao="1.9898e-05" name="Nd-145" />
-        <nuclide ao="1.6128e-06" name="Sm-147" />
-        <nuclide ao="1.1627e-07" name="Sm-149" />
-        <nuclide ao="7.1727e-06" name="Sm-150" />
-        <nuclide ao="5.4947e-07" name="Sm-151" />
-        <nuclide ao="3.0221e-06" name="Sm-152" />
-        <nuclide ao="2.6209e-06" name="Eu-153" />
-        <nuclide ao="1.5369e-09" name="Gd-155" />
-        <nuclide ao="0.045737" name="O-16" />
-    </material>
-    <material id="10" name="Top nozzle region">
-        <density units="g/cm3" value="1.746" />
-        <nuclide name="H-1" wo="0.035887" />
-        <nuclide name="O-16" wo="0.2847761" />
-        <nuclide name="B-10" wo="0.000115699" />
-        <nuclide name="B-11" wo="0.000527075" />
-        <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>
-    <material id="11" name="Top of fuel assemblies">
-        <density units="g/cm3" value="3.044" />
-        <nuclide name="H-1" wo="0.0162913" />
-        <nuclide name="O-16" wo="0.1292776" />
-        <nuclide name="B-10" wo="5.25228e-05" />
-        <nuclide name="B-11" wo="0.000239272" />
-        <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>
-    <material id="12" name="Bottom of fuel assemblies">
-        <density units="g/cm3" value="1.762" />
-        <nuclide name="H-1" wo="0.0292856" />
-        <nuclide name="O-16" wo="0.2323919" />
-        <nuclide name="B-10" wo="9.44159e-05" />
-        <nuclide name="B-11" wo="0.00043012" />
-        <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>
-    <material id="2" name="Cladding">
-        <density units="g/cm3" value="5.77" />
-        <nuclide ao="0.5145" name="Zr-90" />
-        <nuclide ao="0.1122" name="Zr-91" />
-        <nuclide ao="0.1715" name="Zr-92" />
-        <nuclide ao="0.1738" name="Zr-94" />
-        <nuclide ao="0.028" name="Zr-96" />
-    </material>
-    <material id="3" name="Cold borated water">
-        <density units="atom/b-cm" value="0.07416" />
-        <nuclide ao="2.0" name="H-1" />
-        <nuclide ao="1.0" name="O-16" />
-        <nuclide ao="0.000649" name="B-10" />
-        <nuclide ao="0.002689" name="B-11" />
-        <sab name="HH2O" xs="71t" />
-    </material>
-    <material id="4" name="Hot borated water">
-        <density units="atom/b-cm" value="0.06614" />
-        <nuclide ao="2.0" name="H-1" />
-        <nuclide ao="1.0" name="O-16" />
-        <nuclide ao="0.000649" name="B-10" />
-        <nuclide ao="0.002689" name="B-11" />
-        <sab name="HH2O" xs="71t" />
-    </material>
-    <material id="5" name="Reactor pressure vessel steel">
-        <density units="g/cm3" value="7.9" />
-        <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>
-    <material id="6" name="Lower radial reflector">
-        <density units="g/cm3" value="4.32" />
-        <nuclide name="H-1" wo="0.0095661" />
-        <nuclide name="O-16" wo="0.0759107" />
-        <nuclide name="B-10" wo="3.08409e-05" />
-        <nuclide name="B-11" wo="0.000140499" />
-        <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.018287" />
-        <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>
-    <material id="7" name="Upper radial reflector /Top plate region">
-        <density units="g/cm3" value="4.28" />
-        <nuclide name="H-1" wo="0.0086117" />
-        <nuclide name="O-16" wo="0.0683369" />
-        <nuclide name="B-10" wo="2.77638e-05" />
-        <nuclide name="B-11" wo="0.000126481" />
-        <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>
-    <material id="8" name="Bottom plate region">
-        <density units="g/cm3" value="7.184" />
-        <nuclide name="H-1" wo="0.0011505" />
-        <nuclide name="O-16" wo="0.0091296" />
-        <nuclide name="B-10" wo="3.70915e-06" />
-        <nuclide name="B-11" wo="1.68974e-05" />
-        <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.019794" />
-        <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>
-    <material id="9" name="Bottom nozzle region">
-        <density units="g/cm3" value="2.53" />
-        <nuclide name="H-1" wo="0.0245014" />
-        <nuclide name="O-16" wo="0.1944274" />
-        <nuclide name="B-10" wo="7.89917e-05" />
-        <nuclide name="B-11" wo="0.000359854" />
-        <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>
-</materials>
diff --git a/tests/test_score_nuscatter_yn/settings.xml b/tests/test_score_nuscatter_yn/settings.xml
deleted file mode 100644
index 9e514829e..000000000
--- a/tests/test_score_nuscatter_yn/settings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>0</inactive>
-    </eigenvalue>
-    <source>
-        <space type="box">
-            <parameters>-160 -160 -183 160 160 183</parameters>
-        </space>
-    </source>
-</settings>
diff --git a/tests/test_score_nuscatter_yn/tallies.xml b/tests/test_score_nuscatter_yn/tallies.xml
deleted file mode 100644
index eeaad0829..000000000
--- a/tests/test_score_nuscatter_yn/tallies.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-    <tally id="1">
-        <filter bins="21" type="cell" />
-        <scores>nu-scatter-0</scores>
-    </tally>
-    <tally id="2">
-        <filter bins="21" type="cell" />
-        <scores>nu-scatter-y3</scores>
-    </tally>
-</tallies>

From fa9d874dff85627be942b4dd28f7e60012ecf145 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Sat, 24 Oct 2015 10:08:18 -0400
Subject: [PATCH 6/6] Removed unused import for re in trigger.py

---
 openmc/trigger.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openmc/trigger.py b/openmc/trigger.py
index 9c7c66034..e695defde 100644
--- a/openmc/trigger.py
+++ b/openmc/trigger.py
@@ -1,7 +1,6 @@
 from numbers import Real
 from xml.etree import ElementTree as ET
 import sys
-import re
 
 from openmc.checkvalue import check_type, check_value