Score (n,xn) tallies by checking event_MT. Closes #128.

openmc-dev · Jan 4, 2013 · 88daf7c · 88daf7c
1 parent e200f0b
commit 88daf7c
Showing 1 changed file with 6 additions and 21 deletions.
diff --git a/src/tally.F90 b/src/tally.F90
@@ -246,33 +246,18 @@ subroutine score_analog_tally()
             score = last_wgt
 
           case (SCORE_N_2N)
-            ! Skip any event where the particle didn't scatter
-            if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP
-
-            ! Skip any scattering events where the weight didn't double
-            if (nint(wgt/last_wgt) /= 2) cycle SCORE_LOOP
-
-            ! All events that reach this point are (n,2n) reactions
+            ! Skip any event that is not (n,2n)
+            if (p % event_MT /= N_2N) cycle SCORE_LOOP
             score = last_wgt
 
           case (SCORE_N_3N)
-            ! Skip any event where the particle didn't scatter
-            if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP
-
-            ! Skip any scattering events where the weight didn't double
-            if (nint(wgt/last_wgt) /= 3) cycle SCORE_LOOP
-
-            ! All events that reach this point are (n,3n) reactions
+            ! Skip any event that is not (n,3n)
+            if (p % event_MT /= N_3N) cycle SCORE_LOOP
             score = last_wgt
 
           case (SCORE_N_4N)
-            ! Skip any event where the particle didn't scatter
-            if (p % event /= EVENT_SCATTER) cycle SCORE_LOOP
-
-            ! Skip any scattering events where the weight didn't double
-            if (nint(wgt/last_wgt) /= 4) cycle SCORE_LOOP
-
-            ! All events that reach this point are (n,3n) reactions
+            ! Skip any event that is not (n,4n)
+            if (p % event /= N_4N) cycle SCORE_LOOP
             score = last_wgt
 
           case (SCORE_ABSORPTION)