diff --git a/tests/regression_tests/tallies/inputs_true.dat b/tests/regression_tests/tallies/inputs_true.dat
index 6e7b5f3f02..80f55b0341 100644
--- a/tests/regression_tests/tallies/inputs_true.dat
+++ b/tests/regression_tests/tallies/inputs_true.dat
@@ -377,7 +377,8 @@
4
- delayed-nu-fission
+ U235 O16 total
+ delayed-nu-fission decay-rate
5
@@ -440,50 +441,50 @@
13
- absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable
+ absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate
tracklength
13
- absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable
- analog
+ U235 O16 total
+ absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate
+ tracklength
13
- absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable
- collision
-
-
- 14
- flux
- tracklength
-
-
- 14
- flux
+ absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate
analog
+
+ 13
+ U235 O16 total
+ absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate
+ analog
+
+
+ 13
+ absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate
+ collision
+
- 14
- flux
+ 13
+ U235 O16 total
+ absorption delayed-nu-fission events fission inverse-velocity kappa-fission (n,2n) (n,n1) (n,gamma) nu-fission scatter elastic total prompt-nu-fission fission-q-prompt fission-q-recoverable decay-rate
collision
- 13
- U235 total
- total
+ 14
+ flux
tracklength
- 13
- U235 total
- total
+ 14
+ flux
analog
- 13
- U235 total
- total
+ 14
+ flux
collision
diff --git a/tests/regression_tests/tallies/results_true.dat b/tests/regression_tests/tallies/results_true.dat
index c245bc8a15..08a3ba1103 100644
--- a/tests/regression_tests/tallies/results_true.dat
+++ b/tests/regression_tests/tallies/results_true.dat
@@ -1 +1 @@
-aa7f79718620c122e3a13bfa0e200a41b642b09a5d10a6e43e1584181b0314fbeb73c165fe55ddd34c1e9546e381019dd8e3889ca7d99bfe1ab489631bec15d1
\ No newline at end of file
+b5edf87cb58db29aa1c38203141df2f055b88aca675aee9673879b579391412abd232cb3d404f60840ac86b936384050576cccb1e3a1fc5c8290b6e890dda74c
\ No newline at end of file
diff --git a/tests/regression_tests/tallies/test.py b/tests/regression_tests/tallies/test.py
index 601b611f49..eeb74636fe 100644
--- a/tests/regression_tests/tallies/test.py
+++ b/tests/regression_tests/tallies/test.py
@@ -47,7 +47,8 @@ def test_tallies():
dg_tally = Tally()
dg_tally.filters = [DelayedGroupFilter((1, 2, 3, 4, 5, 6))]
- dg_tally.scores = ['delayed-nu-fission']
+ dg_tally.scores = ['delayed-nu-fission', 'decay-rate']
+ dg_tally.nuclides = ['U235', 'O16', 'total']
four_groups = (0.0, 0.253, 1.0e3, 1.0e6, 20.0e6)
energy_filter = EnergyFilter(four_groups)
@@ -130,17 +131,19 @@ def test_tallies():
cell_filter = CellFilter((model.geometry.get_all_cells()[10],
model.geometry.get_all_cells()[21],
22, 23, 60)) # Test both Cell objects and ids
- score_tallies = [Tally(), Tally(), Tally()]
+ score_tallies = [Tally() for i in range(6)]
for t in score_tallies:
t.filters = [cell_filter]
t.scores = ['absorption', 'delayed-nu-fission', 'events', 'fission',
'inverse-velocity', 'kappa-fission', '(n,2n)', '(n,n1)',
'(n,gamma)', 'nu-fission', 'scatter', 'elastic',
'total', 'prompt-nu-fission', 'fission-q-prompt',
- 'fission-q-recoverable']
- score_tallies[0].estimator = 'tracklength'
- score_tallies[1].estimator = 'analog'
- score_tallies[2].estimator = 'collision'
+ 'fission-q-recoverable', 'decay-rate']
+ for t in score_tallies[0:2]: t.estimator = 'tracklength'
+ for t in score_tallies[2:4]: t.estimator = 'analog'
+ for t in score_tallies[4:6]: t.estimator = 'collision'
+ for t in score_tallies[1::2]:
+ t.nuclides = ['U235', 'O16', 'total']
cell_filter2 = CellFilter((21, 22, 23, 27, 28, 29, 60))
flux_tallies = [Tally() for i in range(3)]
@@ -151,15 +154,6 @@ def test_tallies():
flux_tallies[1].estimator = 'analog'
flux_tallies[2].estimator = 'collision'
- total_tallies = [Tally() for i in range(3)]
- for t in total_tallies:
- t.filters = [cell_filter]
- t.scores = ['total']
- t.nuclides = ['U235', 'total']
- total_tallies[0].estimator = 'tracklength'
- total_tallies[1].estimator = 'analog'
- total_tallies[2].estimator = 'collision'
-
all_nuclide_tallies = [Tally() for i in range(4)]
for t in all_nuclide_tallies:
t.filters = [cell_filter]
@@ -179,7 +173,6 @@ def test_tallies():
harmonics_tally, harmonics_tally2, harmonics_tally3, universe_tally]
model.tallies += score_tallies
model.tallies += flux_tallies
- model.tallies += total_tallies
model.tallies += all_nuclide_tallies
harness.main()