diff --git a/tests/test_filter_azimuthal/geometry.xml b/tests/test_filter_azimuthal/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_azimuthal/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 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
-
-
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 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
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 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
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 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
-
-
-
-
diff --git a/tests/test_filter_azimuthal/inputs_true.dat b/tests/test_filter_azimuthal/inputs_true.dat
new file mode 100644
index 0000000000..42b6e820be
--- /dev/null
+++ b/tests/test_filter_azimuthal/inputs_true.dat
@@ -0,0 +1 @@
+1d5f81d12f607f4a8436dfb65167e2a2be55dbf86fbc2cc465cec274671be5eaff517d781a4d40e264bb695e3c66c7ff61a650217c99de2ca8c15ca747fe6b80
\ No newline at end of file
diff --git a/tests/test_filter_azimuthal/materials.xml b/tests/test_filter_azimuthal/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_azimuthal/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
- 71c
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/test_filter_azimuthal/results_true.dat b/tests/test_filter_azimuthal/results_true.dat
index 1141e186cd..7883a730d4 100644
--- a/tests/test_filter_azimuthal/results_true.dat
+++ b/tests/test_filter_azimuthal/results_true.dat
@@ -1,76 +1,76 @@
k-combined:
-1.005983E+00 2.248579E-02
+9.903196E-01 4.279617E-02
tally 1:
-4.425771E+01
-3.941365E+02
-4.568410E+01
-4.186261E+02
-4.331348E+01
-3.761395E+02
-4.303935E+01
-3.722809E+02
-4.442206E+01
-3.973876E+02
+4.215917E+01
+3.561920E+02
+4.174788E+01
+3.505184E+02
+4.603223E+01
+4.242918E+02
+4.496760E+01
+4.075599E+02
+4.088099E+01
+3.376516E+02
tally 2:
-4.465691E+01
-4.000577E+02
-4.493676E+01
-4.042794E+02
-4.526714E+01
-4.105857E+02
-4.187211E+01
-3.514841E+02
-4.448687E+01
-3.969539E+02
+4.157239E+01
+3.482158E+02
+4.227810E+01
+3.613293E+02
+4.376107E+01
+3.835007E+02
+4.644205E+01
+4.327195E+02
+4.191554E+01
+3.522147E+02
tally 3:
-4.425771E+01
-3.941365E+02
-4.568410E+01
-4.186261E+02
-4.333417E+01
-3.764991E+02
-4.301865E+01
-3.719138E+02
-4.442206E+01
-3.973876E+02
+4.215917E+01
+3.561920E+02
+4.174788E+01
+3.505184E+02
+4.603223E+01
+4.242918E+02
+4.496402E+01
+4.075053E+02
+4.088458E+01
+3.377000E+02
tally 4:
-7.168838E+00
-1.042163E+01
-7.971487E+00
-1.403081E+01
-7.476834E+00
-1.127244E+01
-7.777042E+00
-1.297721E+01
-7.305258E+00
-1.147474E+01
-2.136566E+01
-1.013300E+02
-2.111266E+01
-9.951975E+01
-1.879003E+01
-7.275943E+01
-1.902839E+01
-7.679731E+01
-2.069167E+01
-8.887050E+01
-7.056683E+00
-1.113235E+01
-8.240024E+00
-1.529926E+01
-7.945092E+00
-1.293685E+01
-7.537498E+00
-1.182572E+01
-7.441808E+00
-1.244441E+01
-8.434401E+00
-1.529856E+01
-8.211747E+00
-1.474916E+01
-8.883874E+00
-1.644290E+01
-8.356120E+00
-1.491287E+01
-8.612737E+00
-1.659522E+01
+1.531988E+01
+4.816326E+01
+9.274393E+00
+1.821174E+01
+1.595868E+01
+5.124238E+01
+1.299895E+00
+6.417145E-01
+1.510024E+01
+4.604170E+01
+8.533361E+00
+1.462765E+01
+1.658141E+01
+5.595629E+01
+1.427417E+00
+6.621807E-01
+1.683102E+01
+5.741400E+01
+9.845257E+00
+2.028406E+01
+1.773179E+01
+6.477077E+01
+1.536972E+00
+6.111079E-01
+1.586070E+01
+5.360975E+01
+9.928220E+00
+2.089005E+01
+1.737609E+01
+6.161847E+01
+1.700608E+00
+8.439708E-01
+1.607027E+01
+5.490113E+01
+7.569336E+00
+1.280955E+01
+1.606086E+01
+5.308665E+01
+9.898901E-01
+3.143027E-01
diff --git a/tests/test_filter_azimuthal/settings.xml b/tests/test_filter_azimuthal/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_azimuthal/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- 10
- 5
- 100
-
-
-
-
-
- -160 -160 -183
- 160 160 183
-
-
-
-
-
diff --git a/tests/test_filter_azimuthal/tallies.xml b/tests/test_filter_azimuthal/tallies.xml
deleted file mode 100644
index 6ca5413879..0000000000
--- a/tests/test_filter_azimuthal/tallies.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- regular
- -182.07 -182.07
- 182.07 182.07
- 2 2
-
-
-
-
- flux
-
-
-
-
- flux
- analog
-
-
-
-
-
- flux
-
-
-
-
-
- flux
-
-
-
diff --git a/tests/test_filter_azimuthal/test_filter_azimuthal.py b/tests/test_filter_azimuthal/test_filter_azimuthal.py
index 1777db993e..f0fff52047 100644
--- a/tests/test_filter_azimuthal/test_filter_azimuthal.py
+++ b/tests/test_filter_azimuthal/test_filter_azimuthal.py
@@ -1,10 +1,59 @@
#!/usr/bin/env python
+import os
import sys
-sys.path.insert(0, '..')
-from testing_harness import TestHarness
+sys.path.insert(0, os.pardir)
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+
+class FilterAzimuthalTestHarness(PyAPITestHarness):
+ def _build_inputs(self):
+ filt1 = openmc.Filter(type='azimuthal',
+ bins=(-3.1416, -1.8850, -0.6283, 0.6283, 1.8850,
+ 3.1416))
+ tally1 = openmc.Tally(tally_id=1)
+ tally1.add_filter(filt1)
+ tally1.add_score('flux')
+ tally1.estimator = 'tracklength'
+
+ tally2 = openmc.Tally(tally_id=2)
+ tally2.add_filter(filt1)
+ tally2.add_score('flux')
+ tally2.estimator = 'analog'
+
+ filt3 = openmc.Filter(type='azimuthal', bins=(5))
+ tally3 = openmc.Tally(tally_id=3)
+ tally3.add_filter(filt3)
+ tally3.add_score('flux')
+ tally3.estimator = 'tracklength'
+
+ mesh = openmc.Mesh(mesh_id=1)
+ mesh.lower_left = [-182.07, -182.07]
+ mesh.upper_right = [182.07, 182.07]
+ mesh.dimension = [2, 2]
+ filt_mesh = openmc.Filter(type='mesh', bins=(1))
+ tally4 = openmc.Tally(tally_id=4)
+ tally4.add_filter(filt3)
+ tally4.add_filter(filt_mesh)
+ tally4.add_score('flux')
+ tally4.estimator = 'tracklength'
+
+
+ self._input_set.tallies = openmc.TalliesFile()
+ self._input_set.tallies.add_tally(tally1)
+ self._input_set.tallies.add_tally(tally2)
+ self._input_set.tallies.add_tally(tally3)
+ self._input_set.tallies.add_tally(tally4)
+ self._input_set.tallies.add_mesh(mesh)
+
+ super(FilterAzimuthalTestHarness, self)._build_inputs()
+
+ def _cleanup(self):
+ super(FilterAzimuthalTestHarness, self)._cleanup()
+ f = os.path.join(os.getcwd(), 'tallies.xml')
+ if os.path.exists(f): os.remove(f)
if __name__ == '__main__':
- harness = TestHarness('statepoint.10.*', True)
+ harness = FilterAzimuthalTestHarness('statepoint.10.*', True)
harness.main()
diff --git a/tests/test_filter_mu/geometry.xml b/tests/test_filter_mu/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_mu/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 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
-
-
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 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
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 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
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 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
-
-
-
-
diff --git a/tests/test_filter_mu/inputs_true.dat b/tests/test_filter_mu/inputs_true.dat
new file mode 100644
index 0000000000..b0a607ad34
--- /dev/null
+++ b/tests/test_filter_mu/inputs_true.dat
@@ -0,0 +1 @@
+cd2aeb24baafe9a904e697955990f6cffb5f25618fdf8c972775715bfe6e92bc259e36fd2b5addff8181439de58ad6f530972ec391e827f46146a2aaace34358
\ No newline at end of file
diff --git a/tests/test_filter_mu/materials.xml b/tests/test_filter_mu/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_mu/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
- 71c
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/test_filter_mu/results_true.dat b/tests/test_filter_mu/results_true.dat
index c3fbf729bb..e647a46ec0 100644
--- a/tests/test_filter_mu/results_true.dat
+++ b/tests/test_filter_mu/results_true.dat
@@ -1,101 +1,121 @@
k-combined:
-1.005983E+00 2.248579E-02
+9.903196E-01 4.279617E-02
tally 1:
-1.238000E+01
-3.065560E+01
-1.239000E+01
-3.070450E+01
-1.397000E+01
-3.913670E+01
-1.397000E+01
-3.913670E+01
-3.167000E+01
-2.010715E+02
-3.167000E+01
-2.010715E+02
-7.216000E+01
-1.042565E+03
-7.216000E+01
-1.042565E+03
+1.241000E+01
+3.088870E+01
+1.241000E+01
+3.088870E+01
+1.364000E+01
+3.727140E+01
+1.364000E+01
+3.727140E+01
+3.251000E+01
+2.118597E+02
+3.251000E+01
+2.118597E+02
+7.297000E+01
+1.066904E+03
+7.297000E+01
+1.066904E+03
tally 2:
-1.238000E+01
-3.065560E+01
-1.239000E+01
-3.070450E+01
-1.397000E+01
-3.913670E+01
-1.397000E+01
-3.913670E+01
-3.167000E+01
-2.010715E+02
-3.167000E+01
-2.010715E+02
-7.216000E+01
-1.042565E+03
-7.216000E+01
-1.042565E+03
+9.880000E+00
+1.964520E+01
+9.880000E+00
+1.964520E+01
+1.022000E+01
+2.099620E+01
+1.022000E+01
+2.099620E+01
+1.479000E+01
+4.397670E+01
+1.479000E+01
+4.397670E+01
+3.470000E+01
+2.412094E+02
+3.470000E+01
+2.412094E+02
+6.194000E+01
+7.687326E+02
+6.194000E+01
+7.687326E+02
tally 3:
-2.010000E+00
-8.185000E-01
-2.010000E+00
-8.185000E-01
-2.290000E+00
-1.101500E+00
-2.290000E+00
-1.101500E+00
-5.210000E+00
-5.469700E+00
-5.210000E+00
-5.469700E+00
-1.169000E+01
-2.756770E+01
-1.169000E+01
-2.756770E+01
-5.660000E+00
-6.866200E+00
-5.670000E+00
-6.881500E+00
-6.210000E+00
-8.343100E+00
-6.210000E+00
-8.343100E+00
-1.394000E+01
-4.207080E+01
-1.394000E+01
-4.207080E+01
-3.175000E+01
-2.109401E+02
-3.175000E+01
-2.109401E+02
-2.190000E+00
-1.105100E+00
-2.190000E+00
-1.105100E+00
-2.630000E+00
-1.495100E+00
-2.630000E+00
-1.495100E+00
-6.190000E+00
-8.277300E+00
-6.190000E+00
-8.277300E+00
-1.383000E+01
-4.204150E+01
-1.383000E+01
-4.204150E+01
-2.450000E+00
-1.331100E+00
-2.450000E+00
-1.331100E+00
-2.660000E+00
-1.566400E+00
-2.660000E+00
-1.566400E+00
-5.980000E+00
-7.883200E+00
-5.980000E+00
-7.883200E+00
-1.413000E+01
-4.213850E+01
-1.413000E+01
-4.213850E+01
+3.560000E+00
+2.681800E+00
+3.560000E+00
+2.681800E+00
+1.930000E+00
+7.915000E-01
+1.930000E+00
+7.915000E-01
+3.870000E+00
+3.109100E+00
+3.870000E+00
+3.109100E+00
+3.500000E-01
+3.630000E-02
+3.500000E-01
+3.630000E-02
+3.680000E+00
+2.840200E+00
+3.680000E+00
+2.840200E+00
+2.050000E+00
+8.735000E-01
+2.050000E+00
+8.735000E-01
+3.910000E+00
+3.085100E+00
+3.910000E+00
+3.085100E+00
+3.900000E-01
+3.610000E-02
+3.900000E-01
+3.610000E-02
+5.130000E+00
+5.422100E+00
+5.130000E+00
+5.422100E+00
+3.100000E+00
+1.959200E+00
+3.100000E+00
+1.959200E+00
+5.840000E+00
+6.914600E+00
+5.840000E+00
+6.914600E+00
+5.400000E-01
+8.980000E-02
+5.400000E-01
+8.980000E-02
+1.215000E+01
+3.061010E+01
+1.215000E+01
+3.061010E+01
+7.220000E+00
+1.081680E+01
+7.220000E+00
+1.081680E+01
+1.355000E+01
+3.699090E+01
+1.355000E+01
+3.699090E+01
+1.360000E+00
+5.098000E-01
+1.360000E+00
+5.098000E-01
+2.199000E+01
+9.837430E+01
+2.199000E+01
+9.837430E+01
+1.243000E+01
+3.167470E+01
+1.243000E+01
+3.167470E+01
+2.451000E+01
+1.233915E+02
+2.451000E+01
+1.233915E+02
+2.460000E+00
+1.687000E+00
+2.460000E+00
+1.687000E+00
diff --git a/tests/test_filter_mu/settings.xml b/tests/test_filter_mu/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_mu/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- 10
- 5
- 100
-
-
-
-
-
- -160 -160 -183
- 160 160 183
-
-
-
-
-
diff --git a/tests/test_filter_mu/tallies.xml b/tests/test_filter_mu/tallies.xml
deleted file mode 100644
index 095b75548b..0000000000
--- a/tests/test_filter_mu/tallies.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- regular
- -182.07 -182.07
- 182.07 182.07
- 2 2
-
-
-
-
- scatter nu-scatter
-
-
-
-
- scatter nu-scatter
-
-
-
-
-
- scatter nu-scatter
-
-
-
diff --git a/tests/test_filter_mu/test_filter_mu.py b/tests/test_filter_mu/test_filter_mu.py
index 1777db993e..cb9f9b86d8 100644
--- a/tests/test_filter_mu/test_filter_mu.py
+++ b/tests/test_filter_mu/test_filter_mu.py
@@ -1,10 +1,53 @@
#!/usr/bin/env python
+import os
import sys
-sys.path.insert(0, '..')
-from testing_harness import TestHarness
+sys.path.insert(0, os.pardir)
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+
+
+class FilterMuTestHarness(PyAPITestHarness):
+ def _build_inputs(self):
+ filt1 = openmc.Filter(type='mu',
+ bins=(-1.0, -0.5, 0.0, 0.5, 1.0))
+ tally1 = openmc.Tally(tally_id=1)
+ tally1.add_filter(filt1)
+ tally1.add_score('scatter')
+ tally1.add_score('nu-scatter')
+
+ filt2 = openmc.Filter(type='mu', bins=(5))
+ tally2 = openmc.Tally(tally_id=2)
+ tally2.add_filter(filt2)
+ tally2.add_score('scatter')
+ tally2.add_score('nu-scatter')
+
+ mesh = openmc.Mesh(mesh_id=1)
+ mesh.lower_left = [-182.07, -182.07]
+ mesh.upper_right = [182.07, 182.07]
+ mesh.dimension = [2, 2]
+ filt_mesh = openmc.Filter(type='mesh', bins=(1))
+ tally3 = openmc.Tally(tally_id=3)
+ tally3.add_filter(filt2)
+ tally3.add_filter(filt_mesh)
+ tally3.add_score('scatter')
+ tally3.add_score('nu-scatter')
+
+
+ self._input_set.tallies = openmc.TalliesFile()
+ self._input_set.tallies.add_tally(tally1)
+ self._input_set.tallies.add_tally(tally2)
+ self._input_set.tallies.add_tally(tally3)
+ self._input_set.tallies.add_mesh(mesh)
+
+ super(FilterMuTestHarness, self)._build_inputs()
+
+ def _cleanup(self):
+ super(FilterMuTestHarness, self)._cleanup()
+ f = os.path.join(os.getcwd(), 'tallies.xml')
+ if os.path.exists(f): os.remove(f)
if __name__ == '__main__':
- harness = TestHarness('statepoint.10.*', True)
+ harness = FilterMuTestHarness('statepoint.10.*', True)
harness.main()
diff --git a/tests/test_filter_polar/geometry.xml b/tests/test_filter_polar/geometry.xml
deleted file mode 100644
index b85dd04df9..0000000000
--- a/tests/test_filter_polar/geometry.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 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
-
-
-
-
-
- 17 17
- -10.71 -10.71
- 1.26 1.26
-
- 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
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 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
-
-
-
-
-
- 21 21
- -224.91 -224.91
- 21.42 21.42
-
- 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
-
-
-
-
diff --git a/tests/test_filter_polar/inputs_true.dat b/tests/test_filter_polar/inputs_true.dat
new file mode 100644
index 0000000000..db67a890f1
--- /dev/null
+++ b/tests/test_filter_polar/inputs_true.dat
@@ -0,0 +1 @@
+2de29e0a083af0722039ebc246469f26e260d604ab8b76314b2ac472bbd23004e031aec7afe3dbfc4c6112428846cd0cf0c1430e878832b9dab36463d026dee6
\ No newline at end of file
diff --git a/tests/test_filter_polar/materials.xml b/tests/test_filter_polar/materials.xml
deleted file mode 100644
index 9c0b74f3f1..0000000000
--- a/tests/test_filter_polar/materials.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
- 71c
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/test_filter_polar/results_true.dat b/tests/test_filter_polar/results_true.dat
index 0d59076a5f..2d822630e5 100644
--- a/tests/test_filter_polar/results_true.dat
+++ b/tests/test_filter_polar/results_true.dat
@@ -1,76 +1,76 @@
k-combined:
-1.005983E+00 2.248579E-02
+9.903196E-01 4.279617E-02
tally 1:
-1.910392E+01
-7.630892E+01
-6.069713E+01
-7.418935E+02
-6.770107E+01
-9.184032E+02
-5.337004E+01
-5.705965E+02
-1.984454E+01
-7.925660E+01
+2.127061E+01
+9.220793E+01
+5.602776E+01
+6.373945E+02
+6.367492E+01
+8.138443E+02
+5.529942E+01
+6.140264E+02
+1.951517E+01
+7.668661E+01
tally 2:
-1.921411E+01
-7.459156E+01
-5.766370E+01
-6.673586E+02
-6.859495E+01
-9.423025E+02
-5.508385E+01
-6.074301E+02
-2.066319E+01
-8.572734E+01
+2.075936E+01
+8.757254E+01
+5.524881E+01
+6.153139E+02
+6.475252E+01
+8.402281E+02
+5.446664E+01
+5.961174E+02
+2.074180E+01
+8.681580E+01
tally 3:
-1.910392E+01
-7.630892E+01
-6.069713E+01
-7.418935E+02
-6.770107E+01
-9.184032E+02
-5.337004E+01
-5.705965E+02
-1.984454E+01
-7.925660E+01
+2.128073E+01
+9.230382E+01
+5.601764E+01
+6.371703E+02
+6.367492E+01
+8.138443E+02
+5.529942E+01
+6.140264E+02
+1.951517E+01
+7.668661E+01
tally 4:
-2.735945E+00
-1.730332E+00
-1.183844E+01
-3.019848E+01
-1.124996E+01
-2.695006E+01
-8.666721E+00
-1.565510E+01
-3.208395E+00
-2.224532E+00
-9.142422E+00
-1.836800E+01
-2.737713E+01
-1.616026E+02
-3.109025E+01
-2.077063E+02
-2.441723E+01
-1.239858E+02
-8.961378E+00
-1.734852E+01
-3.366946E+00
-2.679164E+00
-1.036680E+01
-2.303250E+01
-1.164055E+01
-2.901348E+01
-8.779036E+00
-1.631915E+01
-4.067773E+00
-3.740384E+00
-3.614413E+00
-3.328712E+00
-1.075780E+01
-2.407723E+01
-1.347969E+01
-3.978344E+01
-1.117709E+01
-2.720682E+01
-3.469883E+00
-2.806129E+00
+8.088647E+00
+1.396899E+01
+3.960907E+00
+3.249150E+00
+8.430714E+00
+1.435355E+01
+7.192159E-01
+1.641710E-01
+1.974619E+01
+8.105078E+01
+1.212452E+01
+3.016420E+01
+2.228348E+01
+1.050847E+02
+1.748809E+00
+9.501796E-01
+2.257423E+01
+1.038902E+02
+1.351331E+01
+3.969787E+01
+2.507638E+01
+1.283664E+02
+2.193118E+00
+1.424580E+00
+2.192232E+01
+9.859711E+01
+1.096779E+01
+2.506373E+01
+2.074138E+01
+8.670015E+01
+1.469145E+00
+8.072204E-01
+6.850719E+00
+9.425536E+00
+4.584038E+00
+4.399762E+00
+7.176883E+00
+1.090693E+01
+8.244944E-01
+1.794291E-01
diff --git a/tests/test_filter_polar/settings.xml b/tests/test_filter_polar/settings.xml
deleted file mode 100644
index 517637a59f..0000000000
--- a/tests/test_filter_polar/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- 10
- 5
- 100
-
-
-
-
-
- -160 -160 -183
- 160 160 183
-
-
-
-
-
diff --git a/tests/test_filter_polar/tallies.xml b/tests/test_filter_polar/tallies.xml
deleted file mode 100644
index 5da81f518a..0000000000
--- a/tests/test_filter_polar/tallies.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- regular
- -182.07 -182.07
- 182.07 182.07
- 2 2
-
-
-
-
- flux
-
-
-
-
- flux
- analog
-
-
-
-
-
- flux
-
-
-
-
-
- flux
-
-
-
diff --git a/tests/test_filter_polar/test_filter_polar.py b/tests/test_filter_polar/test_filter_polar.py
index 1777db993e..74489a3498 100644
--- a/tests/test_filter_polar/test_filter_polar.py
+++ b/tests/test_filter_polar/test_filter_polar.py
@@ -1,10 +1,59 @@
#!/usr/bin/env python
+import os
import sys
-sys.path.insert(0, '..')
-from testing_harness import TestHarness
+sys.path.insert(0, os.pardir)
+from testing_harness import TestHarness, PyAPITestHarness
+import openmc
+
+class FilterPolarTestHarness(PyAPITestHarness):
+ def _build_inputs(self):
+ filt1 = openmc.Filter(type='polar',
+ bins=(0.0, 0.6283, 1.2566, 1.8850, 2.5132,
+ 3.1416))
+ tally1 = openmc.Tally(tally_id=1)
+ tally1.add_filter(filt1)
+ tally1.add_score('flux')
+ tally1.estimator = 'tracklength'
+
+ tally2 = openmc.Tally(tally_id=2)
+ tally2.add_filter(filt1)
+ tally2.add_score('flux')
+ tally2.estimator = 'analog'
+
+ filt3 = openmc.Filter(type='polar', bins=(5))
+ tally3 = openmc.Tally(tally_id=3)
+ tally3.add_filter(filt3)
+ tally3.add_score('flux')
+ tally3.estimator = 'tracklength'
+
+ mesh = openmc.Mesh(mesh_id=1)
+ mesh.lower_left = [-182.07, -182.07]
+ mesh.upper_right = [182.07, 182.07]
+ mesh.dimension = [2, 2]
+ filt_mesh = openmc.Filter(type='mesh', bins=(1))
+ tally4 = openmc.Tally(tally_id=4)
+ tally4.add_filter(filt3)
+ tally4.add_filter(filt_mesh)
+ tally4.add_score('flux')
+ tally4.estimator = 'tracklength'
+
+
+ self._input_set.tallies = openmc.TalliesFile()
+ self._input_set.tallies.add_tally(tally1)
+ self._input_set.tallies.add_tally(tally2)
+ self._input_set.tallies.add_tally(tally3)
+ self._input_set.tallies.add_tally(tally4)
+ self._input_set.tallies.add_mesh(mesh)
+
+ super(FilterPolarTestHarness, self)._build_inputs()
+
+ def _cleanup(self):
+ super(FilterPolarTestHarness, self)._cleanup()
+ f = os.path.join(os.getcwd(), 'tallies.xml')
+ if os.path.exists(f): os.remove(f)
if __name__ == '__main__':
- harness = TestHarness('statepoint.10.*', True)
+ harness = FilterPolarTestHarness('statepoint.10.*', True)
harness.main()
diff --git a/tests/test_score_flux_yn/results_true.dat b/tests/test_score_flux_yn/results_true.dat
index fd4f61f7ae..28a1babb04 100644
--- a/tests/test_score_flux_yn/results_true.dat
+++ b/tests/test_score_flux_yn/results_true.dat
@@ -16,1299 +16,1299 @@ tally 1:
tally 2:
3.890713E+01
3.046363E+02
-1.623579E-01
+-1.623579E-01
4.602199E-02
4.860074E-01
5.999399E-01
-7.895692E-01
+-7.895692E-01
2.803790E-01
2.525526E-01
8.261176E-02
--9.103525E-02
+9.103525E-02
2.246700E-01
4.583205E-01
8.444556E-02
-1.246553E-01
+-1.246553E-01
2.351010E-01
-3.534581E-01
1.247916E-01
-3.700473E-01
+-3.700473E-01
5.215562E-02
-1.831625E-01
1.927381E-01
-1.540114E-01
+-1.540114E-01
1.918221E-02
-1.266458E-01
1.455875E-01
-6.796869E-01
+-6.796869E-01
3.911926E-01
1.987931E-02
4.966442E-02
--4.443797E-01
+4.443797E-01
8.842717E-02
-1.073855E-01
4.912428E-02
-3.999416E-02
+-3.999416E-02
4.440138E-02
2.857919E-01
6.935717E-02
--4.174851E-01
+4.174851E-01
5.485570E-02
-2.178958E-01
8.052149E-02
-1.179644E-02
+-1.179644E-02
6.709330E-02
8.843286E-01
2.749681E-01
--2.935079E-01
+2.935079E-01
3.032897E-02
-1.809434E-01
1.902413E-01
-2.091991E-01
+-2.091991E-01
1.061912E-01
-7.137275E-02
4.397656E-02
--2.311558E-01
+2.311558E-01
4.680679E-02
9.927573E-02
1.844111E-01
-2.821437E-02
+-2.821437E-02
7.293762E-02
6.224251E-01
1.028351E-01
--4.136440E-01
+4.136440E-01
5.198207E-02
-7.833133E-02
1.192960E-02
--1.041586E-01
+1.041586E-01
1.587417E-01
-3.595677E-01
3.086335E-01
-2.096284E-01
+-2.096284E-01
7.881012E-02
1.366220E+01
3.758161E+01
--1.461402E-02
+1.461402E-02
3.260482E-03
8.325893E-02
6.248769E-02
-2.785736E-01
+-2.785736E-01
3.698417E-02
1.932396E-03
1.561742E-02
--8.063397E-02
+8.063397E-02
3.598680E-02
8.565555E-02
5.344369E-03
-3.899905E-02
+-3.899905E-02
2.422867E-02
-1.215439E-01
9.193858E-03
-1.982614E-01
+-1.982614E-01
1.045860E-02
-7.712629E-02
2.199979E-02
--3.626484E-02
+3.626484E-02
9.872078E-04
-6.305159E-02
1.645879E-02
-3.052155E-01
+-3.052155E-01
5.620564E-02
3.507115E-02
1.056383E-02
--1.297490E-02
+1.297490E-02
5.889958E-03
-1.208752E-02
7.323602E-03
-3.441007E-03
+-3.441007E-03
1.841496E-02
5.543442E-02
1.186636E-02
--8.000436E-02
+8.000436E-02
3.703835E-03
-3.636792E-02
1.490603E-02
--8.753196E-02
+8.753196E-02
7.958027E-03
2.066727E-01
1.414130E-02
--3.652482E-02
+3.652482E-02
8.380395E-04
-1.652432E-01
1.878732E-02
-1.375567E-01
+-1.375567E-01
1.302400E-02
3.692057E-03
6.312506E-03
--9.016211E-02
+9.016211E-02
6.699735E-03
-5.875401E-02
1.731945E-02
-3.960008E-02
+-3.960008E-02
3.595906E-03
1.653510E-01
9.277293E-03
--4.064973E-02
+4.064973E-02
2.794606E-03
-1.729061E-02
3.219772E-03
--5.764808E-02
+5.764808E-02
1.861051E-02
-5.970583E-02
2.070164E-02
-6.739411E-02
+-6.739411E-02
1.063341E-02
6.561669E+01
8.680729E+02
-7.938430E-01
+-7.938430E-01
2.994198E-01
9.278084E-01
1.861899E+00
-1.432236E+00
+-1.432236E+00
7.429647E-01
7.460836E-02
5.946808E-01
--6.140731E-02
+6.140731E-02
3.175177E-01
1.212677E+00
5.125288E-01
--1.952865E-02
+1.952865E-02
5.468421E-01
-2.965796E-01
1.123288E-01
-5.334195E-01
+-5.334195E-01
1.589612E-01
-6.340814E-01
4.874650E-01
-4.264003E-02
+-4.264003E-02
9.109571E-03
-4.323424E-01
3.370329E-01
-1.186876E+00
+-1.186876E+00
9.854644E-01
-2.420825E-01
1.699455E-01
--2.920627E-02
+2.920627E-02
6.816643E-02
-2.684345E-01
9.799236E-02
--1.281596E-01
+1.281596E-01
3.092987E-01
3.746150E-01
1.242044E-01
--1.035056E+00
+1.035056E+00
2.589772E-01
2.005450E-01
2.074622E-01
--5.412719E-01
+5.412719E-01
3.193584E-01
1.070173E+00
3.266747E-01
--2.657850E-01
+2.657850E-01
1.599950E-01
-4.694853E-01
2.738937E-01
-7.761977E-01
+-7.761977E-01
2.561652E-01
3.673179E-02
9.486916E-02
--3.309909E-01
+3.309909E-01
1.095243E-01
1.623761E-01
2.874582E-01
--2.846296E-01
+2.846296E-01
2.430397E-01
7.384842E-01
2.556480E-01
--3.577508E-01
+3.577508E-01
1.763210E-01
-2.917525E-01
1.875646E-01
--1.634324E-01
+1.634324E-01
2.952144E-01
-4.329582E-01
3.418652E-01
-2.719362E-01
+-2.719362E-01
2.278925E-01
2.382728E+01
1.170590E+02
-4.718326E-01
+-4.718326E-01
1.961501E-01
1.612551E-02
2.815245E-02
-6.390587E-01
+-6.390587E-01
1.902968E-01
2.290989E-01
3.758858E-02
-1.568179E-01
+-1.568179E-01
1.509162E-01
-2.363058E-01
6.671396E-02
--4.350800E-02
+4.350800E-02
1.031680E-01
-2.956828E-01
2.515141E-02
--4.835878E-01
+4.835878E-01
8.614200E-02
-5.365970E-02
8.404087E-02
--6.079969E-02
+6.079969E-02
3.684343E-02
-1.313088E-02
1.488843E-02
-2.603258E-02
+-2.603258E-02
2.900625E-02
1.249213E-01
2.737277E-02
-4.491422E-01
+-4.491422E-01
9.482600E-02
-1.095589E-01
3.711500E-02
--2.248159E-01
+2.248159E-01
2.815827E-02
-5.976009E-02
5.887828E-03
--6.097208E-02
+6.097208E-02
5.393315E-02
3.449714E-02
4.332442E-02
--1.030757E-01
+1.030757E-01
2.839453E-02
-4.399117E-01
8.887569E-02
-4.564910E-01
+-4.564910E-01
1.172398E-01
-2.528382E-01
1.217655E-01
-3.443316E-01
+-3.443316E-01
4.275616E-02
5.437008E-02
2.355567E-02
--5.505588E-02
+5.505588E-02
5.479129E-02
-8.326640E-02
3.095858E-02
--1.888781E-01
+1.888781E-01
2.884542E-02
1.981251E-01
1.520694E-02
--5.279866E-02
+5.279866E-02
1.020641E-01
-1.465368E-01
3.070686E-02
--2.356940E-01
+2.356940E-01
7.899657E-02
4.109278E-01
5.291082E-02
-2.572510E-01
+-2.572510E-01
3.420895E-02
8.047875E+00
1.334796E+01
-1.707535E-01
+-1.707535E-01
3.290927E-02
1.024687E-01
1.308811E-02
-1.805451E-01
+-1.805451E-01
1.696222E-02
3.519587E-02
7.546726E-03
-1.034933E-01
+-1.034933E-01
2.224207E-02
-1.580512E-01
2.369625E-02
-4.302961E-02
+-4.302961E-02
1.635623E-02
-2.992903E-02
5.190220E-03
--2.130862E-01
+2.130862E-01
1.186351E-02
-3.321696E-02
7.972404E-03
--4.992040E-02
+4.992040E-02
5.667098E-03
1.261320E-02
2.436872E-03
--8.314024E-04
+8.314024E-04
5.360616E-03
-6.318247E-02
1.644558E-03
-1.373600E-01
+-1.373600E-01
1.030707E-02
1.511677E-03
3.467685E-03
--1.923485E-02
+1.923485E-02
8.106508E-04
-1.180094E-01
4.381376E-03
-2.798056E-02
+-2.798056E-02
4.871288E-03
-7.689499E-02
7.079493E-03
-5.842586E-02
+-5.842586E-02
1.380713E-03
-9.946341E-02
7.085062E-03
-8.061825E-02
+-8.061825E-02
8.679468E-03
-9.229524E-03
9.187483E-03
-1.048310E-01
+-1.048310E-01
3.506026E-03
3.666209E-02
3.259203E-03
--1.190727E-01
+1.190727E-01
4.935341E-03
-7.391655E-02
2.805554E-03
--2.029126E-02
+2.029126E-02
2.497736E-03
2.787185E-02
5.677987E-04
--6.873108E-02
+6.873108E-02
1.287727E-02
-5.262840E-02
3.190440E-03
--3.910911E-02
+3.910911E-02
8.661121E-03
1.076197E-01
5.456176E-03
-7.476066E-02
+-7.476066E-02
2.693605E-03
4.056568E+01
3.389623E+02
-6.428633E-01
+-6.428633E-01
6.128893E-01
4.878518E-01
2.130257E-01
-9.548044E-01
+-9.548044E-01
4.556949E-01
2.234940E-01
1.006817E-01
--1.080276E-01
+1.080276E-01
5.980158E-01
-3.639229E-01
3.120105E-01
--3.237506E-01
+3.237506E-01
3.451548E-01
1.143081E-01
7.924550E-02
--6.456733E-01
+6.456733E-01
2.424413E-01
1.478136E-01
1.458665E-01
--2.134798E-02
+2.134798E-02
9.102875E-02
3.633264E-01
7.386463E-02
-2.213946E-01
+-2.213946E-01
1.253249E-01
-3.153847E-01
1.094273E-01
-7.161113E-01
+-7.161113E-01
2.275500E-01
-2.461979E-01
1.484452E-01
--2.332886E-01
+2.332886E-01
9.715521E-02
-7.029988E-02
1.835254E-02
-1.982842E-01
+-1.982842E-01
9.722998E-02
-2.089693E-01
2.271404E-01
--7.316104E-02
+7.316104E-02
3.974665E-02
-3.266640E-01
8.054809E-02
-5.126088E-01
+-5.126088E-01
3.234942E-01
-3.048753E-01
3.439501E-01
-4.872647E-01
+-4.872647E-01
9.473730E-02
1.590200E-01
3.613462E-02
--4.641787E-01
+4.641787E-01
1.671339E-01
-1.391114E-01
3.581561E-02
--2.209343E-01
+2.209343E-01
1.489367E-02
3.015665E-01
4.265694E-02
--1.334716E-01
+1.334716E-01
2.321929E-01
-3.702914E-01
1.699549E-01
--8.891532E-02
+8.891532E-02
1.708595E-01
6.123686E-01
1.429184E-01
-5.891300E-01
+-5.891300E-01
1.085467E-01
tally 3:
-3.077754E+01
-2.017424E+02
--4.040800E-01
-5.606719E-01
--5.238239E-01
-4.460714E-01
-1.155164E-01
-1.686786E-01
--1.972294E-01
-2.912851E-01
-4.908524E-01
-1.374195E-01
--1.467088E-02
-1.080839E-01
-6.749037E-02
-1.397361E-01
-4.136479E-03
-9.237632E-02
--3.742305E-01
-9.917374E-02
-5.374208E-01
-2.530961E-01
-2.270996E-01
-9.415721E-02
--4.568867E-02
-1.277446E-01
-1.581716E-01
-6.217155E-02
-4.667840E-01
-1.143380E-01
-9.684270E-02
-7.302998E-02
-8.366629E-01
-1.797483E-01
--5.657893E-01
-2.553910E-01
--2.351441E-02
-4.395513E-02
-7.843306E-01
-1.466478E-01
-4.617856E-02
-1.154681E-02
-1.431343E-01
-3.531062E-02
-4.625825E-01
-6.235642E-02
--8.837342E-02
-6.231694E-02
--3.766755E-01
-6.412261E-02
-1.995226E-01
-1.743990E-01
--2.498625E-02
-8.897536E-02
--1.039315E-01
-1.868672E-01
-6.712910E-01
-2.084042E-01
-5.805639E-02
-4.049580E-02
-1.603677E-01
-4.280033E-02
-3.909878E-01
-7.726018E-02
-9.878354E-02
-4.630595E-02
--2.389983E-01
-3.528604E-02
-1.641046E-01
-1.669859E-01
--2.351986E-02
-1.048794E-02
-1.172238E+01
-3.139127E+01
--1.057733E+00
-2.820672E-01
-5.708838E-02
-6.224675E-02
-2.492981E-02
-1.827498E-01
--1.339268E-01
-1.968929E-02
-2.363867E-01
-3.028587E-02
--2.867841E-01
-2.680318E-02
--2.352784E-01
-1.895006E-02
-4.365572E-01
-1.883240E-01
--3.388837E-01
-7.209932E-02
-3.488374E-01
-6.640137E-02
--3.343893E-01
-4.149634E-02
--4.575314E-01
-7.461614E-02
-4.436881E-01
-1.325092E-01
-3.394853E-01
-2.987173E-02
--2.633936E-02
-6.171428E-02
-9.994191E-02
-6.447641E-02
--1.618840E-01
-3.497845E-02
--1.290678E-01
-3.735394E-02
-9.852126E-03
-2.963925E-02
--1.656539E-01
-4.190396E-02
--2.292763E-01
-7.045480E-02
--4.616824E-03
-1.926690E-02
--1.960839E-01
-1.396042E-02
--2.133526E-02
-5.189823E-02
-2.933136E-01
-5.721356E-02
--1.084914E-01
-2.448532E-02
--4.778583E-01
-7.644033E-02
-1.736901E-01
-6.630467E-02
--5.460801E-02
-1.510381E-02
-1.106093E-01
-1.590306E-02
-1.659501E-01
-5.983218E-02
-1.343781E-02
-2.751294E-02
-2.052693E-01
-3.478581E-02
--1.006298E-01
-1.815313E-02
--2.563766E-01
-3.045246E-02
-5.231699E+01
-5.870469E+02
--6.102587E-01
-5.930968E-01
-1.184182E+00
-1.364433E+00
--6.362263E-02
-8.852514E-01
--4.844978E-01
-1.751923E-01
-8.223413E-01
-2.436206E-01
--9.656506E-01
-3.513566E-01
-2.710494E-01
-7.170772E-01
-4.792482E-01
-2.551569E-01
--1.266077E-01
-2.824778E-01
-6.389964E-01
-2.501483E-01
-8.915816E-01
-3.557431E-01
--1.007448E+00
-5.743018E-01
-3.528444E-01
-2.428078E-01
--5.833000E-01
-3.733648E-01
--4.660289E-01
-6.567263E-02
-5.856088E-01
-2.336146E-01
-3.836351E-02
-7.665403E-02
--6.721211E-01
-2.651780E-01
-5.725993E-01
-2.101026E-01
--2.130594E-01
-1.855350E-02
-2.607168E-01
-1.564288E-01
--3.399382E-02
-3.067656E-02
--1.228976E+00
-6.554836E-01
--2.962235E-01
-1.808511E-01
-5.521675E-01
-1.722073E-01
--1.658751E-01
-1.994119E-02
--2.671896E-01
-1.343320E-01
--2.325282E-01
-4.677656E-02
--3.380310E-01
-1.703532E-01
--3.571853E-01
-1.140525E-01
-3.836770E-02
-8.586429E-02
-7.328263E-01
-1.567227E-01
-4.840110E-02
-2.718471E-02
-5.654783E-01
-3.645579E-01
--3.027585E-01
-1.407867E-01
-3.259142E+01
-2.336719E+02
-3.053294E-01
-2.086257E-01
--7.563597E-01
-2.816768E-01
--3.039288E-01
-2.855043E-01
--2.648323E-01
-1.883784E-01
-2.665933E-01
-1.782353E-01
-1.978960E-01
-1.419567E-01
-1.228712E-01
-1.913946E-01
--9.152681E-03
-1.324681E-01
--5.707326E-01
-1.092067E-01
-2.326858E-01
-6.731743E-02
--5.170241E-01
-1.353439E-01
--4.064026E-01
-9.715030E-02
--1.142031E-01
-7.748788E-02
-2.928039E-01
-2.716157E-01
--1.721186E-01
-1.447738E-01
-6.452116E-01
-1.821975E-01
--5.697276E-01
-1.047333E-01
--9.640967E-02
-1.139327E-01
--4.509832E-01
-2.079493E-01
--2.134684E-02
-2.907667E-01
--2.434868E-01
-1.235397E-01
-2.550330E-01
-2.979627E-01
-9.598615E-01
-3.140885E-01
-1.218430E-01
-6.283872E-02
-2.412915E-01
-1.907292E-02
--2.236667E-01
-4.379414E-02
-2.844474E-01
-2.965692E-02
-1.618860E-01
-8.293785E-03
--1.265583E-01
-4.515449E-02
-6.356127E-02
-1.358134E-02
--3.844886E-01
-8.600010E-02
--1.942739E-01
-7.516022E-02
-1.765511E-01
-3.522611E-02
--3.433188E-01
-3.456066E-02
--1.501983E-01
-5.633844E-02
-1.040924E+01
-2.432332E+01
--4.138270E-01
-1.309129E-01
--3.151106E-01
-1.286964E-01
-9.213222E-02
-6.189454E-02
--2.746107E-01
-8.103949E-02
--9.781742E-02
-3.783736E-02
--1.178371E-01
-3.242332E-02
--5.837932E-01
-2.059491E-01
--7.338223E-03
-8.012203E-02
-5.628994E-02
-2.190669E-02
-8.155585E-02
-1.039007E-01
-6.052048E-02
-4.339463E-02
--1.157646E-02
-1.839000E-02
--2.641673E-01
-4.737589E-02
--8.531135E-02
-5.432766E-02
-6.036555E-01
-1.190329E-01
--3.149976E-01
-5.735264E-02
--8.456340E-02
-4.563143E-03
-2.224065E-01
-6.600030E-02
-9.562392E-03
-1.843524E-02
--2.400599E-01
-3.182217E-02
--6.534941E-01
-1.180315E-01
-4.371157E-01
-9.076666E-02
-3.257455E-02
-2.936184E-02
--8.788428E-02
-1.923293E-02
--2.604776E-01
-3.660313E-02
--6.315350E-02
-1.503534E-02
-5.609294E-01
-8.783528E-02
--7.363672E-01
-1.789210E-01
-2.883575E-01
-6.478578E-02
--3.302954E-02
-1.517946E-02
--3.234157E-01
-4.418920E-02
-2.846318E-01
-2.712085E-02
--3.227536E-01
-5.062832E-02
-4.391474E-01
-5.548002E-02
-1.322988E-01
-2.995854E-02
-5.709679E+01
-6.978668E+02
-2.859201E-02
-1.094507E+00
-6.058587E-01
-6.079927E-01
-7.553798E-02
-1.131607E+00
--5.851206E-01
-1.215663E+00
-8.266012E-02
-9.031287E-01
--7.088368E-01
-3.984608E-01
--4.414986E-01
-1.502417E-01
-2.241998E-01
-3.228823E-01
--7.328574E-01
-2.430448E-01
--8.070160E-01
-1.767265E-01
--1.154449E-01
-8.739303E-03
--3.787161E-01
-4.728756E-01
--1.743577E-01
-1.091245E-01
-2.878137E-01
-2.724285E-01
-2.128994E-01
-4.440539E-01
-9.495567E-01
-3.622719E-01
-1.422950E-01
-5.309223E-02
-1.323659E-01
-1.911979E-01
--1.303752E-01
-5.710728E-01
--4.611294E-02
-4.086632E-02
-5.937879E-01
-1.006156E-01
--3.558925E-01
-2.998983E-01
-1.175971E+00
-5.323321E-01
-2.426485E-01
-1.497265E-01
-7.805090E-02
-5.060214E-02
--2.914577E-01
-2.233355E-01
-1.053098E-01
-6.693123E-02
-4.541315E-01
-1.328340E-01
--6.290732E-02
-8.910616E-02
-7.371592E-01
-1.980732E-01
-5.804701E-01
-1.711949E-01
--6.642202E-01
-1.131866E-01
-1.779818E-01
-6.530190E-02
--5.224739E-01
-2.534102E-01
--1.824905E-01
-2.910309E-02
+3.862543E+01
+2.993190E+02
+-5.083613E-01
+2.933365E-01
+-4.356793E-01
+6.676831E-01
+-6.093148E-01
+5.685331E-01
+2.512276E-01
+1.308652E-01
+-1.075955E+00
+4.775270E-01
+3.660307E-01
+1.627691E-01
+5.402149E-01
+2.324946E-01
+-3.887573E-01
+1.028105E-01
+4.324152E-01
+1.015147E-01
+3.306993E-02
+8.425069E-02
+2.127456E-01
+5.435453E-02
+2.977294E-01
+1.088039E-01
+-1.055079E+00
+3.590635E-01
+-6.740592E-01
+2.606281E-01
+3.329512E-01
+1.587428E-01
+-1.248691E-01
+1.659045E-01
+2.306000E-01
+1.062057E-01
+9.127791E-02
+2.649459E-01
+2.629881E-01
+4.786229E-02
+2.286813E-01
+2.363629E-02
+6.338613E-01
+1.118828E-01
+7.466647E-01
+1.424535E-01
+7.955161E-02
+1.003327E-02
+1.082691E-01
+2.727882E-02
+-5.295185E-01
+1.335133E-01
+-6.321517E-01
+1.422916E-01
+1.236137E-01
+2.041422E-01
+-5.389265E-02
+1.852888E-01
+3.746082E-01
+5.580885E-02
+1.383528E-01
+2.754456E-01
+5.081204E-01
+1.886515E-01
+-4.022264E-01
+1.417397E-01
+-3.377771E-01
+6.673888E-02
+1.170109E-01
+1.783182E-02
+-2.097916E-01
+7.139323E-02
+1.438678E+01
+4.193571E+01
+-6.547124E-01
+1.780450E-01
+2.207489E-01
+2.115835E-01
+4.952323E-02
+3.039341E-01
+6.681546E-01
+1.389250E-01
+-4.078026E-02
+4.393667E-02
+-8.695509E-01
+2.850853E-01
+-1.792062E-01
+7.367253E-02
+-5.657500E-01
+2.115125E-01
+-8.525189E-02
+2.541971E-02
+5.227867E-02
+2.008468E-02
+6.825349E-02
+5.316522E-02
+3.763076E-01
+7.112554E-02
+-1.279973E-02
+1.883096E-01
+7.775189E-02
+6.874374E-02
+1.119537E-01
+8.467755E-02
+-1.600632E-01
+8.650448E-02
+6.210095E-01
+1.094309E-01
+-9.997484E-02
+3.935353E-02
+-2.300525E-01
+2.351925E-02
+2.486103E-02
+3.125565E-02
+1.289518E-02
+2.879251E-02
+-3.166559E-01
+2.931428E-02
+-1.379285E-02
+2.416257E-02
+1.220552E-02
+5.154030E-02
+-1.431676E-01
+3.434080E-02
+8.148581E-02
+4.218412E-02
+8.541678E-03
+6.396306E-02
+-7.851012E-03
+5.799658E-02
+2.435723E-01
+6.744263E-02
+-2.429877E-01
+6.966516E-02
+-1.638644E-01
+2.058798E-02
+-8.986584E-03
+1.374824E-02
+3.547454E-01
+7.765460E-02
+-1.570173E-01
+6.916960E-02
+-1.056941E-02
+7.626528E-03
+6.400634E+01
+8.298077E+02
+-3.894111E-01
+8.617494E-01
+1.796567E-01
+1.065356E+00
+-1.561037E+00
+7.701475E-01
+-2.237530E-01
+2.259442E-01
+1.109999E+00
+6.179412E-01
+1.636912E+00
+7.887441E-01
+4.661183E-01
+4.191138E-01
+-1.040546E+00
+2.971961E-01
+1.044850E-01
+1.493530E-01
+-4.991935E-01
+3.222404E-01
+-4.205099E-01
+2.734911E-01
+-7.583139E-01
+3.000853E-01
+-3.750811E-01
+1.348273E-01
+-6.355508E-01
+3.666139E-01
+5.233787E-01
+1.292414E-01
+-2.869538E-02
+9.115092E-02
+6.851052E-01
+3.061040E-01
+1.703522E-01
+7.300335E-02
+4.541075E-01
+4.438507E-01
+-2.674857E-01
+4.718588E-01
+3.022517E-02
+1.136781E-01
+5.755596E-01
+2.688162E-01
+2.698373E-01
+1.403188E-01
+8.772347E-01
+3.503562E-01
+-4.258508E-01
+1.400825E-01
+-1.384853E-01
+4.924947E-02
+-1.009402E-01
+2.039230E-01
+-1.339732E-01
+4.772083E-02
+-3.249636E-01
+4.339747E-01
+1.564400E-01
+2.703717E-01
+2.536360E-01
+8.543919E-02
+-3.622063E-01
+7.442240E-02
+-2.074953E-02
+1.355614E-01
+-3.909820E-02
+1.007999E-01
+3.162815E-01
+9.656425E-02
+2.426423E+01
+1.215124E+02
+-9.628829E-01
+3.563586E-01
+2.964625E-01
+9.739638E-02
+-3.680881E-01
+3.484018E-01
+4.339143E-01
+7.590564E-02
+4.633394E-02
+1.080030E-01
+3.091634E-01
+1.246585E-01
+4.520500E-02
+1.095704E-01
+2.479383E-01
+1.138276E-01
+6.457108E-02
+6.833667E-02
+-5.623363E-02
+1.087254E-01
+3.675294E-01
+9.602246E-02
+-1.459951E-01
+9.440544E-02
+-6.817672E-02
+4.978066E-02
+1.076782E-02
+1.697440E-01
+-1.024501E-02
+1.184830E-01
+-1.654178E-01
+1.689209E-02
+-1.006214E-01
+3.392546E-02
+5.070063E-01
+7.598100E-02
+2.251704E-01
+7.867348E-02
+-1.693789E-01
+2.069974E-01
+-2.790249E-01
+2.674643E-02
+3.888604E-01
+3.649330E-02
+7.614452E-02
+7.098023E-02
+1.236282E-02
+5.476895E-02
+-3.151637E-01
+3.543466E-02
+-6.363562E-01
+9.323507E-02
+2.808153E-01
+8.537981E-02
+2.197639E-01
+3.393653E-02
+8.660625E-02
+1.575544E-02
+3.733826E-02
+1.449783E-02
+8.800903E-04
+3.993931E-02
+3.304886E-01
+3.099095E-02
+-4.149186E-02
+5.375091E-02
+2.448819E-01
+9.225028E-02
+-1.230091E-01
+3.865008E-02
+7.600812E+00
+1.199814E+01
+-8.738539E-01
+3.078183E-01
+-2.592305E-01
+1.015952E-01
+-6.391696E-02
+6.657129E-02
+-2.857855E-01
+2.216294E-02
+-3.516811E-01
+3.429194E-02
+4.585144E-02
+6.204056E-02
+-1.599494E-01
+1.684846E-02
+-2.364219E-01
+1.550644E-02
+1.197289E-01
+8.631394E-02
+-1.364517E-01
+5.086560E-02
+-2.213374E-01
+2.779096E-02
+-7.328761E-02
+1.216230E-02
+2.476803E-01
+2.724500E-02
+-6.356296E-02
+2.513244E-02
+-3.886281E-01
+9.479377E-02
+1.006972E-01
+1.352120E-02
+6.932242E-02
+3.192705E-02
+-3.232505E-02
+5.592418E-02
+9.582599E-02
+1.504811E-02
+-2.887999E-01
+3.760482E-02
+-2.372013E-01
+1.868786E-02
+-1.655526E-01
+4.720116E-02
+8.611265E-02
+2.284310E-02
+-2.142116E-01
+2.619080E-02
+-1.811202E-01
+1.457105E-02
+1.430164E-01
+2.016598E-02
+-4.066031E-01
+7.671356E-02
+1.364946E-01
+1.385677E-02
+8.357667E-02
+1.521943E-02
+-2.235270E-02
+1.029570E-02
+-7.920760E-02
+4.227880E-02
+2.622096E-01
+2.327728E-02
+-7.787296E-03
+2.288300E-02
+-1.645219E-02
+5.394704E-02
+7.274557E-02
+1.075570E-02
+4.104875E+01
+3.455300E+02
+-9.827893E-01
+2.751051E-01
+3.227606E-01
+1.213711E-01
+-1.272840E-02
+2.813639E-01
+-1.910394E-01
+5.682320E-02
+4.136260E-01
+2.444497E-01
+-5.123352E-02
+3.867174E-01
+4.424857E-02
+9.651204E-02
+-3.975443E-02
+1.867060E-01
+7.618837E-01
+1.756891E-01
+4.259599E-01
+1.146646E-01
+5.658031E-02
+1.366891E-01
+2.464931E-01
+2.181122E-01
+-1.593998E-01
+2.666678E-01
+-1.928096E-01
+1.216164E-01
+-7.020992E-01
+1.701086E-01
+3.914244E-01
+1.772217E-01
+3.285697E-01
+1.521826E-01
+-2.947923E-02
+8.201284E-02
+-1.346653E-01
+4.498340E-02
+2.112724E-01
+9.923303E-02
+-8.551910E-02
+8.804286E-03
+-3.631005E-01
+1.168145E-01
+-1.840770E-01
+5.714283E-02
+-2.709303E-02
+9.381338E-02
+-2.104005E-02
+4.479215E-02
+4.059493E-01
+8.277066E-02
+2.877400E-01
+8.584721E-02
+4.881128E-02
+1.864179E-01
+8.584545E-02
+4.421744E-02
+-4.392466E-01
+6.260373E-02
+-3.143214E-02
+8.184856E-02
+-5.630973E-01
+1.323469E-01
+-8.010498E-02
+1.096975E-01
+1.818829E-01
+1.717701E-02
+-1.062149E-01
+5.400365E-02
tally 4:
-3.077754E+01
-2.017424E+02
--4.040800E-01
-5.606719E-01
--5.238239E-01
-4.460714E-01
-1.155164E-01
-1.686786E-01
--1.972294E-01
-2.912851E-01
-4.908524E-01
-1.374195E-01
--1.467088E-02
-1.080839E-01
-6.749037E-02
-1.397361E-01
-4.136479E-03
-9.237632E-02
--3.742305E-01
-9.917374E-02
-5.374208E-01
-2.530961E-01
-2.270996E-01
-9.415721E-02
--4.568867E-02
-1.277446E-01
-1.581716E-01
-6.217155E-02
-4.667840E-01
-1.143380E-01
-9.684270E-02
-7.302998E-02
-8.366629E-01
-1.797483E-01
--5.657893E-01
-2.553910E-01
--2.351441E-02
-4.395513E-02
-7.843306E-01
-1.466478E-01
-4.617856E-02
-1.154681E-02
-1.431343E-01
-3.531062E-02
-4.625825E-01
-6.235642E-02
--8.837342E-02
-6.231694E-02
--3.766755E-01
-6.412261E-02
-1.995226E-01
-1.743990E-01
--2.498625E-02
-8.897536E-02
--1.039315E-01
-1.868672E-01
-6.712910E-01
-2.084042E-01
-5.805639E-02
-4.049580E-02
-1.603677E-01
-4.280033E-02
-3.909878E-01
-7.726018E-02
-9.878354E-02
-4.630595E-02
--2.389983E-01
-3.528604E-02
-1.641046E-01
-1.669859E-01
--2.351986E-02
-1.048794E-02
-1.172238E+01
-3.139127E+01
--1.057733E+00
-2.820672E-01
-5.708838E-02
-6.224675E-02
-2.492981E-02
-1.827498E-01
--1.339268E-01
-1.968929E-02
-2.363867E-01
-3.028587E-02
--2.867841E-01
-2.680318E-02
--2.352784E-01
-1.895006E-02
-4.365572E-01
-1.883240E-01
--3.388837E-01
-7.209932E-02
-3.488374E-01
-6.640137E-02
--3.343893E-01
-4.149634E-02
--4.575314E-01
-7.461614E-02
-4.436881E-01
-1.325092E-01
-3.394853E-01
-2.987173E-02
--2.633936E-02
-6.171428E-02
-9.994191E-02
-6.447641E-02
--1.618840E-01
-3.497845E-02
--1.290678E-01
-3.735394E-02
-9.852126E-03
-2.963925E-02
--1.656539E-01
-4.190396E-02
--2.292763E-01
-7.045480E-02
--4.616824E-03
-1.926690E-02
--1.960839E-01
-1.396042E-02
--2.133526E-02
-5.189823E-02
-2.933136E-01
-5.721356E-02
--1.084914E-01
-2.448532E-02
--4.778583E-01
-7.644033E-02
-1.736901E-01
-6.630467E-02
--5.460801E-02
-1.510381E-02
-1.106093E-01
-1.590306E-02
-1.659501E-01
-5.983218E-02
-1.343781E-02
-2.751294E-02
-2.052693E-01
-3.478581E-02
--1.006298E-01
-1.815313E-02
--2.563766E-01
-3.045246E-02
-5.231699E+01
-5.870469E+02
--6.102587E-01
-5.930968E-01
-1.184182E+00
-1.364433E+00
--6.362263E-02
-8.852514E-01
--4.844978E-01
-1.751923E-01
-8.223413E-01
-2.436206E-01
--9.656506E-01
-3.513566E-01
-2.710494E-01
-7.170772E-01
-4.792482E-01
-2.551569E-01
--1.266077E-01
-2.824778E-01
-6.389964E-01
-2.501483E-01
-8.915816E-01
-3.557431E-01
--1.007448E+00
-5.743018E-01
-3.528444E-01
-2.428078E-01
--5.833000E-01
-3.733648E-01
--4.660289E-01
-6.567263E-02
-5.856088E-01
-2.336146E-01
-3.836351E-02
-7.665403E-02
--6.721211E-01
-2.651780E-01
-5.725993E-01
-2.101026E-01
--2.130594E-01
-1.855350E-02
-2.607168E-01
-1.564288E-01
--3.399382E-02
-3.067656E-02
--1.228976E+00
-6.554836E-01
--2.962235E-01
-1.808511E-01
-5.521675E-01
-1.722073E-01
--1.658751E-01
-1.994119E-02
--2.671896E-01
-1.343320E-01
--2.325282E-01
-4.677656E-02
--3.380310E-01
-1.703532E-01
--3.571853E-01
-1.140525E-01
-3.836770E-02
-8.586429E-02
-7.328263E-01
-1.567227E-01
-4.840110E-02
-2.718471E-02
-5.654783E-01
-3.645579E-01
--3.027585E-01
-1.407867E-01
-3.259142E+01
-2.336719E+02
-3.053294E-01
-2.086257E-01
--7.563597E-01
-2.816768E-01
--3.039288E-01
-2.855043E-01
--2.648323E-01
-1.883784E-01
-2.665933E-01
-1.782353E-01
-1.978960E-01
-1.419567E-01
-1.228712E-01
-1.913946E-01
--9.152681E-03
-1.324681E-01
--5.707326E-01
-1.092067E-01
-2.326858E-01
-6.731743E-02
--5.170241E-01
-1.353439E-01
--4.064026E-01
-9.715030E-02
--1.142031E-01
-7.748788E-02
-2.928039E-01
-2.716157E-01
--1.721186E-01
-1.447738E-01
-6.452116E-01
-1.821975E-01
--5.697276E-01
-1.047333E-01
--9.640967E-02
-1.139327E-01
--4.509832E-01
-2.079493E-01
--2.134684E-02
-2.907667E-01
--2.434868E-01
-1.235397E-01
-2.550330E-01
-2.979627E-01
-9.598615E-01
-3.140885E-01
-1.218430E-01
-6.283872E-02
-2.412915E-01
-1.907292E-02
--2.236667E-01
-4.379414E-02
-2.844474E-01
-2.965692E-02
-1.618860E-01
-8.293785E-03
--1.265583E-01
-4.515449E-02
-6.356127E-02
-1.358134E-02
--3.844886E-01
-8.600010E-02
--1.942739E-01
-7.516022E-02
-1.765511E-01
-3.522611E-02
--3.433188E-01
-3.456066E-02
--1.501983E-01
-5.633844E-02
-1.040924E+01
-2.432332E+01
--4.138270E-01
-1.309129E-01
--3.151106E-01
-1.286964E-01
-9.213222E-02
-6.189454E-02
--2.746107E-01
-8.103949E-02
--9.781742E-02
-3.783736E-02
--1.178371E-01
-3.242332E-02
--5.837932E-01
-2.059491E-01
--7.338223E-03
-8.012203E-02
-5.628994E-02
-2.190669E-02
-8.155585E-02
-1.039007E-01
-6.052048E-02
-4.339463E-02
--1.157646E-02
-1.839000E-02
--2.641673E-01
-4.737589E-02
--8.531135E-02
-5.432766E-02
-6.036555E-01
-1.190329E-01
--3.149976E-01
-5.735264E-02
--8.456340E-02
-4.563143E-03
-2.224065E-01
-6.600030E-02
-9.562392E-03
-1.843524E-02
--2.400599E-01
-3.182217E-02
--6.534941E-01
-1.180315E-01
-4.371157E-01
-9.076666E-02
-3.257455E-02
-2.936184E-02
--8.788428E-02
-1.923293E-02
--2.604776E-01
-3.660313E-02
--6.315350E-02
-1.503534E-02
-5.609294E-01
-8.783528E-02
--7.363672E-01
-1.789210E-01
-2.883575E-01
-6.478578E-02
--3.302954E-02
-1.517946E-02
--3.234157E-01
-4.418920E-02
-2.846318E-01
-2.712085E-02
--3.227536E-01
-5.062832E-02
-4.391474E-01
-5.548002E-02
-1.322988E-01
-2.995854E-02
-5.709679E+01
-6.978668E+02
-2.859201E-02
-1.094507E+00
-6.058587E-01
-6.079927E-01
-7.553798E-02
-1.131607E+00
--5.851206E-01
-1.215663E+00
-8.266012E-02
-9.031287E-01
--7.088368E-01
-3.984608E-01
--4.414986E-01
-1.502417E-01
-2.241998E-01
-3.228823E-01
--7.328574E-01
-2.430448E-01
--8.070160E-01
-1.767265E-01
--1.154449E-01
-8.739303E-03
--3.787161E-01
-4.728756E-01
--1.743577E-01
-1.091245E-01
-2.878137E-01
-2.724285E-01
-2.128994E-01
-4.440539E-01
-9.495567E-01
-3.622719E-01
-1.422950E-01
-5.309223E-02
-1.323659E-01
-1.911979E-01
--1.303752E-01
-5.710728E-01
--4.611294E-02
-4.086632E-02
-5.937879E-01
-1.006156E-01
--3.558925E-01
-2.998983E-01
-1.175971E+00
-5.323321E-01
-2.426485E-01
-1.497265E-01
-7.805090E-02
-5.060214E-02
--2.914577E-01
-2.233355E-01
-1.053098E-01
-6.693123E-02
-4.541315E-01
-1.328340E-01
--6.290732E-02
-8.910616E-02
-7.371592E-01
-1.980732E-01
-5.804701E-01
-1.711949E-01
--6.642202E-01
-1.131866E-01
-1.779818E-01
-6.530190E-02
--5.224739E-01
-2.534102E-01
--1.824905E-01
-2.910309E-02
+3.862543E+01
+2.993190E+02
+-5.083613E-01
+2.933365E-01
+-4.356793E-01
+6.676831E-01
+-6.093148E-01
+5.685331E-01
+2.512276E-01
+1.308652E-01
+-1.075955E+00
+4.775270E-01
+3.660307E-01
+1.627691E-01
+5.402149E-01
+2.324946E-01
+-3.887573E-01
+1.028105E-01
+4.324152E-01
+1.015147E-01
+3.306993E-02
+8.425069E-02
+2.127456E-01
+5.435453E-02
+2.977294E-01
+1.088039E-01
+-1.055079E+00
+3.590635E-01
+-6.740592E-01
+2.606281E-01
+3.329512E-01
+1.587428E-01
+-1.248691E-01
+1.659045E-01
+2.306000E-01
+1.062057E-01
+9.127791E-02
+2.649459E-01
+2.629881E-01
+4.786229E-02
+2.286813E-01
+2.363629E-02
+6.338613E-01
+1.118828E-01
+7.466647E-01
+1.424535E-01
+7.955161E-02
+1.003327E-02
+1.082691E-01
+2.727882E-02
+-5.295185E-01
+1.335133E-01
+-6.321517E-01
+1.422916E-01
+1.236137E-01
+2.041422E-01
+-5.389265E-02
+1.852888E-01
+3.746082E-01
+5.580885E-02
+1.383528E-01
+2.754456E-01
+5.081204E-01
+1.886515E-01
+-4.022264E-01
+1.417397E-01
+-3.377771E-01
+6.673888E-02
+1.170109E-01
+1.783182E-02
+-2.097916E-01
+7.139323E-02
+1.438678E+01
+4.193571E+01
+-6.547124E-01
+1.780450E-01
+2.207489E-01
+2.115835E-01
+4.952323E-02
+3.039341E-01
+6.681546E-01
+1.389250E-01
+-4.078026E-02
+4.393667E-02
+-8.695509E-01
+2.850853E-01
+-1.792062E-01
+7.367253E-02
+-5.657500E-01
+2.115125E-01
+-8.525189E-02
+2.541971E-02
+5.227867E-02
+2.008468E-02
+6.825349E-02
+5.316522E-02
+3.763076E-01
+7.112554E-02
+-1.279973E-02
+1.883096E-01
+7.775189E-02
+6.874374E-02
+1.119537E-01
+8.467755E-02
+-1.600632E-01
+8.650448E-02
+6.210095E-01
+1.094309E-01
+-9.997484E-02
+3.935353E-02
+-2.300525E-01
+2.351925E-02
+2.486103E-02
+3.125565E-02
+1.289518E-02
+2.879251E-02
+-3.166559E-01
+2.931428E-02
+-1.379285E-02
+2.416257E-02
+1.220552E-02
+5.154030E-02
+-1.431676E-01
+3.434080E-02
+8.148581E-02
+4.218412E-02
+8.541678E-03
+6.396306E-02
+-7.851012E-03
+5.799658E-02
+2.435723E-01
+6.744263E-02
+-2.429877E-01
+6.966516E-02
+-1.638644E-01
+2.058798E-02
+-8.986584E-03
+1.374824E-02
+3.547454E-01
+7.765460E-02
+-1.570173E-01
+6.916960E-02
+-1.056941E-02
+7.626528E-03
+6.400634E+01
+8.298077E+02
+-3.894111E-01
+8.617494E-01
+1.796567E-01
+1.065356E+00
+-1.561037E+00
+7.701475E-01
+-2.237530E-01
+2.259442E-01
+1.109999E+00
+6.179412E-01
+1.636912E+00
+7.887441E-01
+4.661183E-01
+4.191138E-01
+-1.040546E+00
+2.971961E-01
+1.044850E-01
+1.493530E-01
+-4.991935E-01
+3.222404E-01
+-4.205099E-01
+2.734911E-01
+-7.583139E-01
+3.000853E-01
+-3.750811E-01
+1.348273E-01
+-6.355508E-01
+3.666139E-01
+5.233787E-01
+1.292414E-01
+-2.869538E-02
+9.115092E-02
+6.851052E-01
+3.061040E-01
+1.703522E-01
+7.300335E-02
+4.541075E-01
+4.438507E-01
+-2.674857E-01
+4.718588E-01
+3.022517E-02
+1.136781E-01
+5.755596E-01
+2.688162E-01
+2.698373E-01
+1.403188E-01
+8.772347E-01
+3.503562E-01
+-4.258508E-01
+1.400825E-01
+-1.384853E-01
+4.924947E-02
+-1.009402E-01
+2.039230E-01
+-1.339732E-01
+4.772083E-02
+-3.249636E-01
+4.339747E-01
+1.564400E-01
+2.703717E-01
+2.536360E-01
+8.543919E-02
+-3.622063E-01
+7.442240E-02
+-2.074953E-02
+1.355614E-01
+-3.909820E-02
+1.007999E-01
+3.162815E-01
+9.656425E-02
+2.426423E+01
+1.215124E+02
+-9.628829E-01
+3.563586E-01
+2.964625E-01
+9.739638E-02
+-3.680881E-01
+3.484018E-01
+4.339143E-01
+7.590564E-02
+4.633394E-02
+1.080030E-01
+3.091634E-01
+1.246585E-01
+4.520500E-02
+1.095704E-01
+2.479383E-01
+1.138276E-01
+6.457108E-02
+6.833667E-02
+-5.623363E-02
+1.087254E-01
+3.675294E-01
+9.602246E-02
+-1.459951E-01
+9.440544E-02
+-6.817672E-02
+4.978066E-02
+1.076782E-02
+1.697440E-01
+-1.024501E-02
+1.184830E-01
+-1.654178E-01
+1.689209E-02
+-1.006214E-01
+3.392546E-02
+5.070063E-01
+7.598100E-02
+2.251704E-01
+7.867348E-02
+-1.693789E-01
+2.069974E-01
+-2.790249E-01
+2.674643E-02
+3.888604E-01
+3.649330E-02
+7.614452E-02
+7.098023E-02
+1.236282E-02
+5.476895E-02
+-3.151637E-01
+3.543466E-02
+-6.363562E-01
+9.323507E-02
+2.808153E-01
+8.537981E-02
+2.197639E-01
+3.393653E-02
+8.660625E-02
+1.575544E-02
+3.733826E-02
+1.449783E-02
+8.800903E-04
+3.993931E-02
+3.304886E-01
+3.099095E-02
+-4.149186E-02
+5.375091E-02
+2.448819E-01
+9.225028E-02
+-1.230091E-01
+3.865008E-02
+7.600812E+00
+1.199814E+01
+-8.738539E-01
+3.078183E-01
+-2.592305E-01
+1.015952E-01
+-6.391696E-02
+6.657129E-02
+-2.857855E-01
+2.216294E-02
+-3.516811E-01
+3.429194E-02
+4.585144E-02
+6.204056E-02
+-1.599494E-01
+1.684846E-02
+-2.364219E-01
+1.550644E-02
+1.197289E-01
+8.631394E-02
+-1.364517E-01
+5.086560E-02
+-2.213374E-01
+2.779096E-02
+-7.328761E-02
+1.216230E-02
+2.476803E-01
+2.724500E-02
+-6.356296E-02
+2.513244E-02
+-3.886281E-01
+9.479377E-02
+1.006972E-01
+1.352120E-02
+6.932242E-02
+3.192705E-02
+-3.232505E-02
+5.592418E-02
+9.582599E-02
+1.504811E-02
+-2.887999E-01
+3.760482E-02
+-2.372013E-01
+1.868786E-02
+-1.655526E-01
+4.720116E-02
+8.611265E-02
+2.284310E-02
+-2.142116E-01
+2.619080E-02
+-1.811202E-01
+1.457105E-02
+1.430164E-01
+2.016598E-02
+-4.066031E-01
+7.671356E-02
+1.364946E-01
+1.385677E-02
+8.357667E-02
+1.521943E-02
+-2.235270E-02
+1.029570E-02
+-7.920760E-02
+4.227880E-02
+2.622096E-01
+2.327728E-02
+-7.787296E-03
+2.288300E-02
+-1.645219E-02
+5.394704E-02
+7.274557E-02
+1.075570E-02
+4.104875E+01
+3.455300E+02
+-9.827893E-01
+2.751051E-01
+3.227606E-01
+1.213711E-01
+-1.272840E-02
+2.813639E-01
+-1.910394E-01
+5.682320E-02
+4.136260E-01
+2.444497E-01
+-5.123352E-02
+3.867174E-01
+4.424857E-02
+9.651204E-02
+-3.975443E-02
+1.867060E-01
+7.618837E-01
+1.756891E-01
+4.259599E-01
+1.146646E-01
+5.658031E-02
+1.366891E-01
+2.464931E-01
+2.181122E-01
+-1.593998E-01
+2.666678E-01
+-1.928096E-01
+1.216164E-01
+-7.020992E-01
+1.701086E-01
+3.914244E-01
+1.772217E-01
+3.285697E-01
+1.521826E-01
+-2.947923E-02
+8.201284E-02
+-1.346653E-01
+4.498340E-02
+2.112724E-01
+9.923303E-02
+-8.551910E-02
+8.804286E-03
+-3.631005E-01
+1.168145E-01
+-1.840770E-01
+5.714283E-02
+-2.709303E-02
+9.381338E-02
+-2.104005E-02
+4.479215E-02
+4.059493E-01
+8.277066E-02
+2.877400E-01
+8.584721E-02
+4.881128E-02
+1.864179E-01
+8.584545E-02
+4.421744E-02
+-4.392466E-01
+6.260373E-02
+-3.143214E-02
+8.184856E-02
+-5.630973E-01
+1.323469E-01
+-8.010498E-02
+1.096975E-01
+1.818829E-01
+1.717701E-02
+-1.062149E-01
+5.400365E-02
diff --git a/tests/test_score_nuscatter_yn/results_true.dat b/tests/test_score_nuscatter_yn/results_true.dat
index 79c89b7708..2b14a72560 100644
--- a/tests/test_score_nuscatter_yn/results_true.dat
+++ b/tests/test_score_nuscatter_yn/results_true.dat
@@ -6,33 +6,33 @@ tally 1:
tally 2:
2.514000E+01
6.511880E+01
--2.222467E-01
+2.222467E-01
2.881247E-02
3.019176E-01
3.014833E-02
-8.459006E-04
+-8.459006E-04
4.773570E-02
9.596964E-02
1.009754E-02
--4.314855E-02
+4.314855E-02
6.207871E-03
4.607677E-02
9.205573E-03
--2.345994E-03
+2.345994E-03
1.243004E-02
9.577397E-02
6.605519E-03
--2.821584E-02
+2.821584E-02
3.834286E-03
-1.077389E-01
6.570217E-03
--1.106443E-01
+1.106443E-01
1.006436E-02
1.322104E-01
7.721677E-03
-1.315548E-02
+-1.315548E-02
5.488918E-04
-2.792171E-02
5.816161E-03
--1.994370E-02
+1.994370E-02
1.169674E-03
diff --git a/tests/test_score_scatter_yn/results_true.dat b/tests/test_score_scatter_yn/results_true.dat
index 20b7672eb5..fb6b4749d1 100644
--- a/tests/test_score_scatter_yn/results_true.dat
+++ b/tests/test_score_scatter_yn/results_true.dat
@@ -6,51 +6,51 @@ tally 1:
tally 2:
1.485000E+01
4.439790E+01
-8.440076E-02
+-8.440076E-02
1.135203E-02
8.198663E-02
3.887429E-02
-1.358080E-01
+-1.358080E-01
2.890416E-02
-3.544823E-02
9.843339E-04
-1.542072E-01
+-1.542072E-01
8.228126E-03
1.057111E-01
3.758100E-03
-1.647870E-02
+-1.647870E-02
4.827841E-03
1.378297E-01
1.566876E-02
--4.676778E-02
+4.676778E-02
4.809366E-03
1.966204E-02
7.447981E-04
--1.889258E-02
+1.889258E-02
6.841953E-04
1.337703E-02
1.250077E-03
-1.044684E-01
+-1.044684E-01
6.969498E-03
-1.177995E-02
8.208715E-03
-1.940058E-04
+-1.940058E-04
5.128759E-03
-2.165868E-02
1.335569E-03
-3.080886E-02
+-3.080886E-02
4.544434E-04
1.039856E-03
1.209631E-03
-1.317068E-02
+-1.317068E-02
1.469722E-03
-6.432758E-02
2.106736E-03
--3.323023E-02
+3.323023E-02
4.513838E-03
2.683700E-02
1.146747E-03
-3.494912E-02
+-3.494912E-02
1.006153E-03
6.289525E-02
3.700145E-03
diff --git a/tests/test_score_total_yn/results_true.dat b/tests/test_score_total_yn/results_true.dat
index 81bef81d22..b416b05ec3 100644
--- a/tests/test_score_total_yn/results_true.dat
+++ b/tests/test_score_total_yn/results_true.dat
@@ -112,101 +112,101 @@ tally 2:
0.000000E+00
9.780506E-01
1.942072E-01
-4.170415E-02
+-4.170415E-02
7.581469E-04
-2.419728E-03
6.296241E-04
-8.163997E-03
+-8.163997E-03
4.785197E-04
3.971909E-03
1.363304E-04
--1.585497E-02
+1.585497E-02
1.295251E-04
-7.029875E-02
1.208194E-03
-1.524070E-02
+-1.524070E-02
2.828843E-04
-2.141105E-02
2.953327E-04
-2.147623E-02
+-2.147623E-02
2.390414E-04
5.592040E-04
1.720605E-04
--3.022066E-03
+3.022066E-03
1.843720E-04
1.489821E-02
9.193290E-05
-1.354668E-02
+-1.354668E-02
2.551940E-04
-5.692690E-04
3.013453E-04
--2.324582E-02
+2.324582E-02
2.170615E-04
1.883012E-02
1.045949E-04
-3.997107E-03
+-3.997107E-03
1.674058E-04
1.616443E-02
2.046286E-04
--1.625747E-02
+1.625747E-02
1.851351E-04
1.120209E-02
2.028649E-04
--4.240284E-03
+4.240284E-03
4.019011E-05
1.535379E-02
9.872559E-05
-8.973926E-03
+-8.973926E-03
1.448680E-04
-3.933227E-03
4.305328E-04
1.767552E+01
6.295417E+01
-1.458308E-01
+-1.458308E-01
8.239551E-03
1.976485E-01
7.360520E-02
-2.647182E-01
+-2.647182E-01
5.347815E-02
1.828025E-01
1.840743E-02
--1.865994E-01
+1.865994E-01
2.843407E-02
-6.438995E-02
8.898045E-03
-1.416445E-01
+-1.416445E-01
3.839856E-02
-3.298894E-01
2.672141E-02
-1.462639E-01
+-1.462639E-01
1.225250E-02
-6.410138E-02
3.766615E-02
--4.701705E-02
+4.701705E-02
1.968428E-03
2.953056E-02
2.358647E-02
-1.717672E-01
+-1.717672E-01
5.877351E-02
1.927497E-02
1.358953E-02
--1.708870E-01
+1.708870E-01
1.502033E-02
4.453803E-02
1.622532E-02
-2.076143E-02
+-2.076143E-02
1.850686E-03
1.111325E-01
8.415150E-03
--1.249594E-01
+1.249594E-01
7.491280E-03
1.381757E-02
1.537264E-02
-7.286234E-03
+-7.286234E-03
9.057874E-03
3.162973E-01
3.303388E-02
--1.012773E-01
+1.012773E-01
8.345375E-03
-5.238963E-02
3.920421E-02
@@ -262,51 +262,51 @@ tally 2:
0.000000E+00
3.863588E+00
3.013300E+00
--5.075749E-02
+5.075749E-02
1.018210E-03
3.445344E-02
5.778215E-03
-6.239642E-02
+-6.239642E-02
4.107408E-03
-1.475495E-02
7.971898E-04
--5.809323E-02
+5.809323E-02
3.039895E-03
-2.510339E-02
3.529134E-04
-9.731680E-03
+-9.731680E-03
1.221628E-03
-5.815144E-02
1.403261E-03
-4.936694E-02
+-4.936694E-02
6.481626E-04
5.141985E-03
1.343973E-03
--1.515105E-02
+1.515105E-02
3.044735E-04
4.474521E-03
1.155268E-03
-6.855877E-02
+-6.855877E-02
4.048417E-03
-2.701967E-05
1.279041E-03
--2.197636E-02
+2.197636E-02
2.843662E-04
-1.780381E-02
8.441574E-04
--2.916634E-02
+2.916634E-02
2.530602E-03
2.289834E-02
2.201375E-03
--3.283424E-02
+3.283424E-02
7.615219E-04
9.623726E-03
7.614092E-04
--2.808239E-02
+2.808239E-02
1.500381E-03
4.835419E-02
6.933678E-04
-2.636221E-02
+-2.636221E-02
2.230834E-04
-4.957463E-02
1.939266E-03
@@ -362,51 +362,51 @@ tally 2:
0.000000E+00
5.356594E+01
5.839391E+02
-1.198882E+00
+-1.198882E+00
3.391100E-01
3.952398E-01
5.729760E-01
-1.045726E+00
+-1.045726E+00
4.419194E-01
2.683170E-01
1.872580E-01
--5.059349E-01
+5.059349E-01
2.592209E-01
4.561651E-01
1.253696E-01
-4.273775E-01
+-4.273775E-01
3.509266E-01
-6.300496E-01
2.102051E-01
-3.094705E-01
+-3.094705E-01
1.410278E-01
-6.840225E-01
1.971765E-01
--4.123355E-02
+4.123355E-02
3.962538E-02
-1.554557E-01
2.784362E-02
-4.698631E-01
+-4.698631E-01
1.867413E-01
-7.016026E-02
3.059344E-02
--2.922284E-01
+2.922284E-01
8.680517E-02
-1.252431E-01
3.180591E-02
--1.825937E-01
+1.825937E-01
8.626653E-02
1.637960E-01
1.329538E-01
--6.662867E-01
+6.662867E-01
1.497985E-01
4.662585E-01
7.552145E-02
--1.198254E-03
+1.198254E-03
2.020899E-01
5.281410E-01
9.615758E-02
--6.396211E-02
+6.396211E-02
1.806992E-01
-1.898620E-01
1.113751E-01
@@ -513,101 +513,101 @@ tally 3:
0.000000E+00
9.300000E-01
1.839000E-01
--4.056201E-03
+4.056201E-03
8.670884E-04
-2.262959E-02
2.263780E-03
-4.568371E-02
+-4.568371E-02
4.078305E-03
6.023055E-02
1.099458E-03
-2.468374E-02
+-2.468374E-02
3.403931E-03
-8.676202E-02
2.444658E-03
--2.075016E-02
+2.075016E-02
5.432442E-03
1.101095E-02
3.129947E-04
--8.689134E-03
+8.689134E-03
2.422445E-03
-1.097503E-02
4.670673E-04
--4.979355E-02
+4.979355E-02
1.791811E-03
1.769845E-02
6.074665E-04
-1.473469E-02
+-1.473469E-02
1.257671E-03
-1.133757E-02
1.555143E-03
--1.730195E-02
+1.730195E-02
1.841949E-03
-1.191492E-02
1.859105E-03
--9.038577E-03
+9.038577E-03
4.401577E-04
1.770047E-02
4.158291E-04
--1.492809E-02
+1.492809E-02
5.488168E-04
7.970152E-02
1.597910E-03
--3.741348E-02
+3.741348E-02
5.704935E-04
2.078478E-02
5.379832E-04
-1.355930E-02
+-1.355930E-02
6.747758E-04
3.416200E-02
8.262470E-04
1.739000E+01
6.083290E+01
-2.434171E-01
+-2.434171E-01
3.049063E-02
-1.278707E-01
9.585267E-02
-2.597328E-01
+-2.597328E-01
8.692607E-02
2.496700E-01
3.750933E-02
-1.309937E-01
+-1.309937E-01
4.217907E-02
-1.863241E-01
1.738581E-02
--1.292679E-01
+1.292679E-01
1.799004E-02
-3.543191E-01
3.682107E-02
--1.904413E-01
+1.904413E-01
1.455250E-02
-7.093238E-02
1.473997E-02
--1.920412E-01
+1.920412E-01
1.308864E-02
1.566093E-01
1.913492E-02
-2.499642E-01
+-2.499642E-01
3.036874E-02
-2.323022E-01
3.794368E-02
--6.361729E-02
+6.361729E-02
3.266166E-02
4.688479E-02
2.806712E-02
--9.796563E-02
+9.796563E-02
1.419748E-02
1.000847E-02
3.233262E-02
--7.570231E-02
+7.570231E-02
4.626536E-03
1.489091E-01
1.159345E-02
--2.236285E-01
+2.236285E-01
1.480084E-02
2.461305E-01
1.643844E-02
--1.773523E-02
+1.773523E-02
1.626036E-03
6.570774E-02
1.069893E-02
@@ -663,51 +663,51 @@ tally 3:
0.000000E+00
4.160000E+00
3.501000E+00
-9.464171E-02
+-9.464171E-02
8.682833E-03
8.467800E-02
1.402624E-02
--1.283471E-02
+1.283471E-02
2.630439E-02
1.859869E-01
1.189528E-02
--1.910311E-02
+1.910311E-02
2.907370E-03
-2.542253E-01
2.143851E-02
-4.021473E-02
+-4.021473E-02
5.812599E-03
-1.242140E-01
1.017873E-02
-2.934198E-02
+-2.934198E-02
2.409920E-03
5.719767E-02
2.211520E-03
--3.023903E-02
+3.023903E-02
2.870625E-03
1.092479E-01
6.089989E-03
--1.604743E-02
+1.604743E-02
1.110224E-02
3.811062E-03
5.234112E-03
--5.446762E-02
+5.446762E-02
5.323411E-03
-3.868978E-02
4.949255E-03
--1.384260E-01
+1.384260E-01
4.903532E-03
-3.761889E-02
2.524889E-03
-6.079772E-02
+-6.079772E-02
2.328339E-03
1.956623E-03
4.096814E-03
--1.716402E-03
+1.716402E-03
2.022751E-03
-1.108600E-01
3.227014E-03
-2.447622E-03
+-2.447622E-03
4.075421E-03
1.582493E-02
4.847858E-03
@@ -763,51 +763,51 @@ tally 3:
0.000000E+00
5.213000E+01
5.552351E+02
-6.019876E-01
+-6.019876E-01
2.938936E-01
2.126970E-01
3.363271E-01
-6.928646E-01
+-6.928646E-01
3.077152E-01
-2.976474E-01
5.830705E-02
--7.804821E-01
+7.804821E-01
3.967156E-01
5.737502E-01
1.090147E-01
-2.867929E-01
+-2.867929E-01
1.312720E-01
-4.735578E-01
6.714577E-02
-6.340442E-02
+-6.340442E-02
4.240623E-02
-1.594570E-01
1.167021E-01
-5.403124E-02
+-5.403124E-02
6.452745E-02
-2.670969E-01
5.822561E-02
-3.033558E-01
+-3.033558E-01
4.890487E-02
-3.515557E-01
5.069681E-02
--2.257462E-01
+2.257462E-01
4.682933E-02
-1.449924E-02
1.625521E-02
--2.809498E-01
+2.809498E-01
6.883451E-02
1.904808E-01
1.004755E-01
--2.570005E-01
+2.570005E-01
4.301248E-02
9.493600E-02
7.708499E-02
-2.804222E-01
+-2.804222E-01
4.455703E-02
3.199914E-01
7.435651E-02
-2.818069E-04
+-2.818069E-04
7.231318E-02
3.689494E-01
1.349712E-01
@@ -914,101 +914,101 @@ tally 4:
0.000000E+00
9.453374E-01
1.815824E-01
-4.552571E-02
+-4.552571E-02
8.689847E-04
4.192526E-03
6.095248E-04
-4.085060E-03
+-4.085060E-03
3.488081E-04
3.074303E-02
3.709785E-04
--1.949067E-02
+1.949067E-02
1.995057E-04
-7.372260E-02
1.709765E-03
-5.140901E-03
+-5.140901E-03
6.268082E-05
-2.589014E-02
1.616678E-04
--1.683116E-02
+1.683116E-02
2.122512E-04
-1.074659E-02
1.087471E-04
--3.762844E-03
+3.762844E-03
3.439135E-05
1.365793E-02
5.255161E-05
--5.869374E-05
+5.869374E-05
4.060049E-04
-7.715004E-03
3.629588E-04
--8.240120E-03
+8.240120E-03
5.192031E-04
1.662861E-02
5.038262E-04
-2.845811E-03
+-2.845811E-03
2.843348E-04
1.826833E-03
1.104947E-05
-5.596885E-04
+-5.596885E-04
1.922661E-05
1.398723E-02
1.025178E-04
--1.733988E-02
+1.733988E-02
1.184228E-04
1.250057E-02
1.447801E-04
-5.450018E-03
+-5.450018E-03
3.725923E-05
2.390947E-02
6.837656E-04
1.739000E+01
6.083290E+01
-2.434171E-01
+-2.434171E-01
3.049063E-02
-1.278707E-01
9.585267E-02
-2.597328E-01
+-2.597328E-01
8.692607E-02
2.496700E-01
3.750933E-02
-1.309937E-01
+-1.309937E-01
4.217907E-02
-1.863241E-01
1.738581E-02
--1.292679E-01
+1.292679E-01
1.799004E-02
-3.543191E-01
3.682107E-02
--1.904413E-01
+1.904413E-01
1.455250E-02
-7.093238E-02
1.473997E-02
--1.920412E-01
+1.920412E-01
1.308864E-02
1.566093E-01
1.913492E-02
-2.499642E-01
+-2.499642E-01
3.036874E-02
-2.323022E-01
3.794368E-02
--6.361729E-02
+6.361729E-02
3.266166E-02
4.688479E-02
2.806712E-02
--9.796563E-02
+9.796563E-02
1.419748E-02
1.000847E-02
3.233262E-02
--7.570231E-02
+7.570231E-02
4.626536E-03
1.489091E-01
1.159345E-02
--2.236285E-01
+2.236285E-01
1.480084E-02
2.461305E-01
1.643844E-02
--1.773523E-02
+1.773523E-02
1.626036E-03
6.570774E-02
1.069893E-02
@@ -1064,51 +1064,51 @@ tally 4:
0.000000E+00
4.160000E+00
3.501000E+00
-9.464171E-02
+-9.464171E-02
8.682833E-03
8.467800E-02
1.402624E-02
--1.283471E-02
+1.283471E-02
2.630439E-02
1.859869E-01
1.189528E-02
--1.910311E-02
+1.910311E-02
2.907370E-03
-2.542253E-01
2.143851E-02
-4.021473E-02
+-4.021473E-02
5.812599E-03
-1.242140E-01
1.017873E-02
-2.934198E-02
+-2.934198E-02
2.409920E-03
5.719767E-02
2.211520E-03
--3.023903E-02
+3.023903E-02
2.870625E-03
1.092479E-01
6.089989E-03
--1.604743E-02
+1.604743E-02
1.110224E-02
3.811062E-03
5.234112E-03
--5.446762E-02
+5.446762E-02
5.323411E-03
-3.868978E-02
4.949255E-03
--1.384260E-01
+1.384260E-01
4.903532E-03
-3.761889E-02
2.524889E-03
-6.079772E-02
+-6.079772E-02
2.328339E-03
1.956623E-03
4.096814E-03
--1.716402E-03
+1.716402E-03
2.022751E-03
-1.108600E-01
3.227014E-03
-2.447622E-03
+-2.447622E-03
4.075421E-03
1.582493E-02
4.847858E-03
@@ -1164,51 +1164,51 @@ tally 4:
0.000000E+00
5.213000E+01
5.552351E+02
-6.019876E-01
+-6.019876E-01
2.938936E-01
2.126970E-01
3.363271E-01
-6.928646E-01
+-6.928646E-01
3.077152E-01
-2.976474E-01
5.830705E-02
--7.804821E-01
+7.804821E-01
3.967156E-01
5.737502E-01
1.090147E-01
-2.867929E-01
+-2.867929E-01
1.312720E-01
-4.735578E-01
6.714577E-02
-6.340442E-02
+-6.340442E-02
4.240623E-02
-1.594570E-01
1.167021E-01
-5.403124E-02
+-5.403124E-02
6.452745E-02
-2.670969E-01
5.822561E-02
-3.033558E-01
+-3.033558E-01
4.890487E-02
-3.515557E-01
5.069681E-02
--2.257462E-01
+2.257462E-01
4.682933E-02
-1.449924E-02
1.625521E-02
--2.809498E-01
+2.809498E-01
6.883451E-02
1.904808E-01
1.004755E-01
--2.570005E-01
+2.570005E-01
4.301248E-02
9.493600E-02
7.708499E-02
-2.804222E-01
+-2.804222E-01
4.455703E-02
3.199914E-01
7.435651E-02
-2.818069E-04
+-2.818069E-04
7.231318E-02
3.689494E-01
1.349712E-01