Merge branch 'nuscatter_fix' into scatt_bins

2026-07-28 06:05:58 -04:00 · 2015-09-26 14:07:03 -04:00 · 2015-09-26 14:07:03 -04:00 · 754c8ea57e
commit 754c8ea57e
parent cab4524849 5658cb0e66
4 changed files with 440 additions and 428 deletions
--- a/src/tally.F90
+++ b/src/tally.F90
@ -175,21 +175,25 @@ contains
        ! For scattering production, we need to use the pre-collision
        ! weight times the multiplicity as the estimate for the number of
        ! neutrons exiting a reaction with neutrons in the exit channel
-
-        do m = 1, nuclides(i_nuclide) % n_reaction
-          ! Check if this is the desired MT
-          if (p % event_MT == nuclides(i_nuclide) % reactions(m) % MT) then
-            ! Found the reaction, set our pointer and move on with life
-            rxn => nuclides(i_nuclide) % reactions(m)
-            exit
-          end if
-        end do
-
-        ! Get multiplicity
-        if (rxn % multiplicity_with_E) then
-          multiplicity = interpolate_tab1(rxn % multiplicity_E, p % last_E)
+        if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. &
+            (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then
+          multiplicity = ONE
        else
-          multiplicity = real(rxn % multiplicity,8)
+          do m = 1, nuclides(p % event_nuclide) % n_reaction
+            ! Check if this is the desired MT
+            if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then
+              ! Found the reaction, set our pointer and move on with life
+              rxn => nuclides(p % event_nuclide) % reactions(m)
+              exit
+            end if
+          end do
+
+          ! Get multiplicity
+          if (rxn % multiplicity_with_E) then
+            multiplicity = interpolate_tab1(rxn % multiplicity_E, p % last_E)
+          else
+            multiplicity = real(rxn % multiplicity,8)
+          end if
        end if

        ! Apply multiplicity to the last weight
@ -206,21 +210,25 @@ contains
        ! For scattering production, we need to use the pre-collision
        ! weight times the multiplicity as the estimate for the number of
        ! neutrons exiting a reaction with neutrons in the exit channel
-
-        do m = 1, nuclides(i_nuclide) % n_reaction
-          ! Check if this is the desired MT
-          if (p % event_MT == nuclides(i_nuclide) % reactions(m) % MT) then
-            ! Found the reaction, set our pointer and move on with life
-            rxn => nuclides(i_nuclide) % reactions(m)
-            exit
-          end if
-        end do
-
-        ! Get multiplicity
-        if (rxn % multiplicity_with_E) then
-          multiplicity = interpolate_tab1(rxn % multiplicity_E, p % last_E)
+        if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. &
+            (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then
+          multiplicity = ONE
        else
-          multiplicity = real(rxn % multiplicity,8)
+          do m = 1, nuclides(p % event_nuclide) % n_reaction
+            ! Check if this is the desired MT
+            if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then
+              ! Found the reaction, set our pointer and move on with life
+              rxn => nuclides(p % event_nuclide) % reactions(m)
+              exit
+            end if
+          end do
+
+          ! Get multiplicity
+          if (rxn % multiplicity_with_E) then
+            multiplicity = interpolate_tab1(rxn % multiplicity_E, p % last_E)
+          else
+            multiplicity = real(rxn % multiplicity,8)
+          end if
        end if

        ! Apply multiplicity to the last weight
@ -237,21 +245,25 @@ contains
        ! For scattering production, we need to use the pre-collision
        ! weight times the multiplicity as the estimate for the number of
        ! neutrons exiting a reaction with neutrons in the exit channel
-
-        do m = 1, nuclides(i_nuclide) % n_reaction
-          ! Check if this is the desired MT
-          if (p % event_MT == nuclides(i_nuclide) % reactions(m) % MT) then
-            ! Found the reaction, set our pointer and move on with life
-            rxn => nuclides(i_nuclide) % reactions(m)
-            exit
-          end if
-        end do
-
-        ! Get multiplicity
-        if (rxn % multiplicity_with_E) then
-          multiplicity = interpolate_tab1(rxn % multiplicity_E, p % last_E)
+        if (p % event_MT == ELASTIC .or. p % event_MT == N_LEVEL .or. &
+            (p % event_MT >= N_N1 .and. p % event_MT <= N_NC)) then
+          multiplicity = ONE
        else
-          multiplicity = real(rxn % multiplicity,8)
+          do m = 1, nuclides(p % event_nuclide) % n_reaction
+            ! Check if this is the desired MT
+            if (p % event_MT == nuclides(p % event_nuclide) % reactions(m) % MT) then
+              ! Found the reaction, set our pointer and move on with life
+              rxn => nuclides(p % event_nuclide) % reactions(m)
+              exit
+            end if
+          end do
+
+          ! Get multiplicity
+          if (rxn % multiplicity_with_E) then
+            multiplicity = interpolate_tab1(rxn % multiplicity_E, p % last_E)
+          else
+            multiplicity = real(rxn % multiplicity,8)
+          end if
        end if

        ! Apply multiplicity to the last weight
--- a/tests/test_cmfd_feed/results_true.dat
+++ b/tests/test_cmfd_feed/results_true.dat
@ -1,128 +1,128 @@
 k-combined:
-1.172666E+00 8.502438E-03
+1.168349E+00 1.145333E-02
 tally 1:
-1.170812E+01
-1.376785E+01
-2.179886E+01
-4.765478E+01
-2.945614E+01
-8.709999E+01
-3.527293E+01
-1.245879E+02
-3.829349E+01
-1.470691E+02
-3.709040E+01
-1.379455E+02
-3.380335E+01
-1.145311E+02
-2.801351E+01
-7.871047E+01
-2.029625E+01
-4.131602E+01
-1.084302E+01
-1.180329E+01
+1.167844E+01
+1.366808E+01
+2.141846E+01
+4.598143E+01
+2.928738E+01
+8.615095E+01
+3.513015E+01
+1.241914E+02
+3.715164E+01
+1.384553E+02
+3.639309E+01
+1.327919E+02
+3.370872E+01
+1.138391E+02
+2.875251E+01
+8.292323E+01
+2.117740E+01
+4.512961E+01
+1.130554E+01
+1.289872E+01
 tally 2:
-2.270565E+01
-2.599927E+01
-1.590852E+01
-1.276260E+01
-2.252857E+00
-2.614120E-01
-4.313167E+01
-9.326539E+01
-3.044479E+01
-4.648169E+01
-4.023051E+00
-8.172006E-01
-5.859113E+01
-1.725665E+02
-4.171599E+01
-8.755981E+01
-5.512216E+00
-1.531207E+00
-6.892516E+01
-2.383198E+02
-4.904413E+01
-1.207096E+02
-6.542718E+00
-2.155749E+00
-7.421495E+01
-2.764539E+02
-5.288881E+01
-1.405388E+02
-6.811354E+00
-2.358827E+00
-7.278191E+01
-2.661597E+02
-5.169924E+01
-1.343999E+02
-6.516967E+00
-2.148745E+00
-6.655238E+01
-2.222812E+02
-4.729758E+01
-1.123214E+02
-6.102046E+00
-1.890147E+00
-5.708495E+01
-1.636585E+02
-4.068603E+01
-8.317681E+01
-5.394757E+00
-1.465413E+00
-4.136562E+01
-8.598520E+01
-2.958591E+01
-4.402226E+01
-3.765802E+00
-7.200302E-01
-2.275517E+01
-2.614738E+01
-1.589295E+01
-1.276624E+01
-2.232715E+00
-2.558645E-01
+2.339531E+01
+2.755922E+01
+1.646762E+01
+1.365289E+01
+2.146174E+00
+2.369613E-01
+4.309769E+01
+9.312913E+01
+3.054873E+01
+4.681242E+01
+4.076365E+00
+8.462370E-01
+5.840647E+01
+1.715260E+02
+4.161366E+01
+8.713062E+01
+5.382541E+00
+1.473814E+00
+6.927641E+01
+2.411359E+02
+4.943841E+01
+1.228850E+02
+6.282202E+00
+1.990021E+00
+7.308593E+01
+2.678848E+02
+5.202069E+01
+1.357621E+02
+6.826145E+00
+2.353974E+00
+7.117026E+01
+2.543546E+02
+5.068896E+01
+1.290261E+02
+6.342979E+00
+2.033850E+00
+6.615720E+01
+2.193712E+02
+4.725156E+01
+1.119514E+02
+6.024815E+00
+1.833752E+00
+5.738164E+01
+1.651944E+02
+4.081217E+01
+8.360122E+01
+5.326191E+00
+1.435896E+00
+4.208669E+01
+8.911740E+01
+2.994944E+01
+4.517409E+01
+3.905846E+00
+7.855247E-01
+2.273578E+01
+2.615080E+01
+1.603853E+01
+1.303560E+01
+2.160924E+00
+2.473278E-01
 tally 3:
-1.529144E+01
-1.179942E+01
-1.023883E+00
-5.386625E-02
-2.936854E+01
-4.326483E+01
-1.881629E+00
-1.788063E-01
-4.015056E+01
-8.114284E+01
-2.594958E+00
-3.407980E-01
-4.720593E+01
-1.118311E+02
-3.161769E+00
-5.053887E-01
-5.095790E+01
-1.304930E+02
-3.308202E+00
-5.528151E-01
-4.979520E+01
-1.246892E+02
-3.163884E+00
-5.062497E-01
-4.554330E+01
-1.041770E+02
-3.019145E+00
-4.618487E-01
-3.921119E+01
-7.727273E+01
-2.472070E+00
-3.099171E-01
-2.843166E+01
-4.067093E+01
-1.823607E+00
-1.688171E-01
-1.530477E+01
-1.184246E+01
-1.047996E+00
-5.549017E-02
+1.584939E+01
+1.265206E+01
+1.096930E+00
+6.173135E-02
+2.940258E+01
+4.337818E+01
+1.932931E+00
+1.884749E-01
+4.008186E+01
+8.086427E+01
+2.512704E+00
+3.189987E-01
+4.759648E+01
+1.139252E+02
+3.041630E+00
+4.683237E-01
+5.006181E+01
+1.257467E+02
+3.137042E+00
+4.981005E-01
+4.883211E+01
+1.197646E+02
+3.130686E+00
+4.987337E-01
+4.550029E+01
+1.038199E+02
+2.853740E+00
+4.127265E-01
+3.937822E+01
+7.785807E+01
+2.488983E+00
+3.156421E-01
+2.884912E+01
+4.192640E+01
+1.855316E+00
+1.745109E-01
+1.543635E+01
+1.208459E+01
+1.025635E+00
+5.351565E-02
 tally 4:
 0.000000E+00
 0.000000E+00
@ -160,8 +160,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.111592E+00
-4.883699E-01
+3.119914E+00
+4.908283E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -208,10 +208,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.536088E+00
-1.540676E+00
-2.727975E+00
-3.757452E-01
+5.567786E+00
+1.556825E+00
+2.766088E+00
+3.864023E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -256,10 +256,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.518115E+00
-2.840502E+00
-5.271874E+00
-1.398895E+00
+7.491891E+00
+2.819491E+00
+5.235154E+00
+1.377898E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -304,10 +304,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.764240E+00
-3.855378E+00
-7.176540E+00
-2.591613E+00
+8.810357E+00
+3.898704E+00
+7.233068E+00
+2.630659E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -352,10 +352,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.381092E+00
-4.414024E+00
-8.597689E+00
-3.710217E+00
+9.374583E+00
+4.414420E+00
+8.565683E+00
+3.687428E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -400,10 +400,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.158655E+00
-4.215178E+00
-9.188880E+00
-4.244766E+00
+9.001252E+00
+4.073267E+00
+8.974821E+00
+4.050120E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -448,10 +448,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.362511E+00
-3.509173E+00
-9.159213E+00
-4.209143E+00
+8.236452E+00
+3.401934E+00
+9.042286E+00
+4.102906E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -496,10 +496,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.029505E+00
-2.479106E+00
-8.613258E+00
-3.719199E+00
+7.028546E+00
+2.482380E+00
+8.577643E+00
+3.691947E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -544,10 +544,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.119892E+00
-1.320586E+00
-7.401001E+00
-2.749355E+00
+5.159585E+00
+1.342512E+00
+7.389236E+00
+2.745028E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -592,10 +592,10 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.765680E+00
-3.903229E-01
-5.461998E+00
-1.501206E+00
+2.762685E+00
+3.914181E-01
+5.471849E+00
+1.509910E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -642,8 +642,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.044921E+00
-4.656739E-01
+3.038522E+00
+4.643520E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@ -662,114 +662,114 @@ k cmfd
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.177990E+00
-1.160010E+00
-1.155990E+00
-1.160167E+00
-1.162166E+00
-1.161566E+00
-1.164454E+00
-1.166269E+00
-1.168529E+00
-1.168622E+00
-1.170296E+00
-1.168644E+00
-1.172975E+00
-1.176543E+00
-1.173389E+00
-1.178422E+00
+1.180802E+00
+1.162698E+00
+1.162794E+00
+1.159752E+00
+1.152596E+00
+1.151652E+00
+1.148131E+00
+1.151875E+00
+1.151434E+00
+1.158833E+00
+1.160751E+00
+1.155305E+00
+1.155356E+00
+1.158866E+00
+1.161574E+00
+1.154691E+00
 cmfd entropy
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.214145E+00
-3.225292E+00
-3.229509E+00
-3.228530E+00
-3.224203E+00
-3.225547E+00
-3.224720E+00
-3.224546E+00
-3.224527E+00
-3.223579E+00
-3.224380E+00
-3.223483E+00
-3.222819E+00
-3.223067E+00
-3.224007E+00
-3.220616E+00
+3.214195E+00
+3.225164E+00
+3.227316E+00
+3.225663E+00
+3.226390E+00
+3.225832E+00
+3.226707E+00
+3.227866E+00
+3.229948E+00
+3.229269E+00
+3.230044E+00
+3.231568E+00
+3.234694E+00
+3.234771E+00
+3.234915E+00
+3.235876E+00
 cmfd balance
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.801684E-03
-2.802571E-03
-1.828029E-03
-2.220542E-03
-1.709900E-03
-2.008246E-03
-2.578373E-03
-2.000076E-03
-1.645365E-03
-1.462882E-03
-1.208273E-03
-1.146126E-03
-1.214196E-03
-1.082376E-03
-8.967163E-04
-1.154433E-03
+4.742525E-03
+2.646417E-03
+1.981783E-03
+1.856593E-03
+1.797685E-03
+2.122587E-03
+1.200823E-03
+2.177249E-03
+1.442840E-03
+1.477754E-03
+1.236325E-03
+1.048988E-03
+8.395164E-04
+7.380254E-04
+7.742837E-04
+8.235911E-04
 cmfd dominance ratio
 0.000E+00
 0.000E+00
 0.000E+00
 0.000E+00
- 5.472E-01
- 5.521E-01
- 5.445E-01
- 5.527E-01
+ 5.467E-01
+ 5.518E-01
+ 5.535E-01
+ 5.500E-01
+ 5.481E-01
+ 5.478E-01
+ 5.467E-01
+ 5.465E-01
+ 5.493E-01
 5.488E-01
- 5.078E-01
- 5.474E-01
- 5.475E-01
- 5.473E-01
- 5.469E-01
- 5.461E-01
- 5.455E-01
- 5.454E-01
- 5.459E-01
- 5.460E-01
- 5.432E-01
+ 5.491E-01
+ 5.503E-01
+ 5.529E-01
+ 5.531E-01
+ 5.534E-01
+ 5.552E-01
 cmfd openmc source comparison
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.186654E-03
-6.033650E-03
-3.920380E-03
-4.218939E-03
-4.591972E-03
-4.042772E-03
-4.100500E-03
-3.664495E-03
-3.266803E-03
-3.164213E-03
-3.310474E-03
-3.165822E-03
-3.849586E-03
-2.718170E-03
-2.431480E-03
-3.322902E-03
+9.168094E-03
+5.978693E-03
+4.369223E-03
+4.546309E-03
+4.222522E-03
+4.221686E-03
+4.604208E-03
+3.950286E-03
+2.939283E-03
+3.667020E-03
+2.592899E-03
+2.272158E-03
+1.229170E-03
+1.114150E-03
+1.060490E-03
+1.714222E-03
 cmfd source
-4.296288E-02
-7.964357E-02
-1.107722E-01
-1.359821E-01
-1.425321E-01
-1.356719E-01
-1.285829E-01
-1.040603E-01
-7.630230E-02
-4.348975E-02
+4.724285E-02
+8.305825E-02
+1.081058E-01
+1.314542E-01
+1.357299E-01
+1.359417E-01
+1.240918E-01
+1.087580E-01
+8.111239E-02
+4.450518E-02
--- a/tests/test_cmfd_nofeed/results_true.dat
+++ b/tests/test_cmfd_nofeed/results_true.dat
@ -83,44 +83,44 @@ tally 2:
 2.336090E+00
 2.851840E-01
 tally 3:
-1.523800E+01
-1.170551E+01
+1.524100E+01
+1.171023E+01
 1.071050E+00
 5.839198E-02
-2.862100E+01
-4.111143E+01
+2.862800E+01
+4.113148E+01
 1.892774E+00
 1.812712E-01
-3.804200E+01
-7.314552E+01
+3.804600E+01
+7.316097E+01
 2.423654E+00
 2.968521E-01
-4.433500E+01
-9.878201E+01
+4.434600E+01
+9.882906E+01
 2.823929E+00
 4.033633E-01
-4.954300E+01
-1.229796E+02
+4.955300E+01
+1.230293E+02
 3.226029E+00
 5.265680E-01
-4.999000E+01
-1.256279E+02
+4.999400E+01
+1.256474E+02
 3.232464E+00
 5.286388E-01
-4.723500E+01
-1.120638E+02
+4.724300E+01
+1.121029E+02
 3.015553E+00
 4.606928E-01
-4.050800E+01
-8.237529E+01
+4.051300E+01
+8.239672E+01
 2.592073E+00
 3.412174E-01
-2.911800E+01
-4.263022E+01
+2.912700E+01
+4.265700E+01
 1.875109E+00
 1.785438E-01
-1.592800E+01
-1.279461E+01
+1.593500E+01
+1.280638E+01
 1.038638E+00
 5.538157E-02
 tally 4:
@ -662,114 +662,114 @@ k cmfd
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.177990E+00
-1.160491E+00
-1.145875E+00
-1.148719E+00
-1.140676E+00
-1.141509E+00
-1.143597E+00
-1.141954E+00
-1.150311E+00
-1.155088E+00
-1.155464E+00
-1.152786E+00
-1.156950E+00
-1.159040E+00
-1.160571E+00
-1.161251E+00
+1.180802E+00
+1.163440E+00
+1.148572E+00
+1.151423E+00
+1.143374E+00
+1.144091E+00
+1.146212E+00
+1.144900E+00
+1.153511E+00
+1.158766E+00
+1.159179E+00
+1.156627E+00
+1.160647E+00
+1.162860E+00
+1.164312E+00
+1.164928E+00
 cmfd entropy
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.214145E+00
-3.222082E+00
-3.225870E+00
-3.230292E+00
-3.228784E+00
-3.228863E+00
-3.228331E+00
-3.230222E+00
-3.231212E+00
-3.230979E+00
-3.229831E+00
-3.229258E+00
-3.228559E+00
-3.227915E+00
-3.227427E+00
-3.229561E+00
+3.214195E+00
+3.222259E+00
+3.225989E+00
+3.230436E+00
+3.228875E+00
+3.229003E+00
+3.228502E+00
+3.230397E+00
+3.231417E+00
+3.231192E+00
+3.229995E+00
+3.229396E+00
+3.228730E+00
+3.228091E+00
+3.227600E+00
+3.229723E+00
 cmfd balance
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.801684E-03
-3.228380E-03
-2.568997E-03
-2.195796E-03
-2.248884E-03
-3.405416E-03
-2.332198E-03
-2.576061E-03
-2.326651E-03
-2.324425E-03
-2.205364E-03
-2.112702E-03
-1.864656E-03
-1.804877E-03
-1.557106E-03
-1.312058E-03
+4.742525E-03
+3.110598E-03
+2.490108E-03
+2.114137E-03
+2.190200E-03
+3.281877E-03
+2.219193E-03
+2.458372E-03
+2.200863E-03
+2.181858E-03
+2.064212E-03
+1.961178E-03
+1.713250E-03
+1.665361E-03
+1.436016E-03
+1.193462E-03
 cmfd dominance ratio
 0.000E+00
 0.000E+00
 0.000E+00
 0.000E+00
- 5.472E-01
- 5.510E-01
- 5.519E-01
- 5.535E-01
- 5.535E-01
+ 5.467E-01
 5.505E-01
- 5.488E-01
- 5.505E-01
- 5.510E-01
- 5.513E-01
- 5.510E-01
+ 5.514E-01
+ 5.531E-01
+ 5.529E-01
+ 5.501E-01
+ 5.484E-01
+ 5.500E-01
+ 5.506E-01
 5.508E-01
- 5.487E-01
- 5.489E-01
- 5.481E-01
- 5.499E-01
+ 5.504E-01
+ 5.500E-01
+ 5.480E-01
+ 5.482E-01
+ 5.475E-01
+ 5.493E-01
 cmfd openmc source comparison
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.186654E-03
-5.964812E-03
-4.465905E-03
-4.119425E-03
-4.973577E-03
-4.092492E-03
-4.063342E-03
-2.804589E-03
-3.632667E-03
-5.005042E-03
-3.428575E-03
-3.007070E-03
-3.091465E-03
-3.030625E-03
-2.751739E-03
-1.762364E-03
+9.168094E-03
+5.976241E-03
+4.426550E-03
+4.107499E-03
+4.957716E-03
+4.026213E-03
+3.986000E-03
+2.702714E-03
+3.619345E-03
+4.909616E-03
+3.355042E-03
+2.945724E-03
+3.010811E-03
+2.965662E-03
+2.673073E-03
+1.669634E-03
 cmfd source
-4.538792E-02
-8.103354E-02
-1.045198E-01
-1.221411E-01
-1.398214E-01
-1.401011E-01
-1.305055E-01
-1.120110E-01
-8.032924E-02
-4.414939E-02
+4.539734E-02
+8.104913E-02
+1.045143E-01
+1.221516E-01
+1.398002E-01
+1.400323E-01
+1.304628E-01
+1.120006E-01
+8.038230E-02
+4.420934E-02
--- a/tests/test_many_scores/results_true.dat
+++ b/tests/test_many_scores/results_true.dat
@ -7,16 +7,8 @@ tally 1:
 3.427342E+01
 8.628000E+00
 2.481430E+01
-8.628000E+00
-2.481430E+01
-5.102293E-01
-8.710841E-02
-8.628000E+00
-2.481430E+01
-9.329009E-01
-2.902534E-01
-5.102293E-01
-8.710841E-02
+8.632000E+00
+2.483728E+01
 5.102293E-01
 8.710841E-02
 8.628000E+00
@ -25,6 +17,14 @@ tally 1:
 2.902534E-01
 5.102293E-01
 8.710841E-02
+5.087118E-01
+8.657086E-02
+8.632000E+00
+2.483728E+01
+9.328366E-01
+2.902108E-01
+5.087118E-01
+8.657086E-02
 9.212024E+00
 2.829472E+01
 8.628000E+00
@ -89,23 +89,23 @@ tally 1:
 1.459209E-04
 4.629047E-02
 7.823267E-04
-8.628000E+00
-2.481430E+01
-4.712248E-02
-1.140942E-03
-6.431930E-02
-4.290580E-03
-9.251642E-02
-8.134201E-03
-1.020119E-04
-1.154184E-04
-2.994164E-02
-3.079076E-04
-2.128844E-02
-2.046549E-04
-1.637972E-02
-1.459209E-04
-4.629047E-02
-7.823267E-04
+8.632000E+00
+2.483728E+01
+-4.651997E-02
+1.133839E-03
+-6.416955E-02
+4.279418E-03
+-9.280565E-02
+8.095106E-03
+-2.078094E-04
+1.151292E-04
+-3.005568E-02
+3.104764E-04
+2.199519E-02
+2.179172E-04
+1.660645E-02
+1.451345E-04
+4.607553E-02
+7.673412E-04
 1.014000E+01
 3.427342E+01