diff --git a/docs/source/methods/photon_physics.rst b/docs/source/methods/photon_physics.rst index 43140136ca4..12b97a436d1 100644 --- a/docs/source/methods/photon_physics.rst +++ b/docs/source/methods/photon_physics.rst @@ -751,6 +751,14 @@ and Auger electrons: 5. Repeat from step 1 for vacancy left by the transition electron. +Fluorescence photons and Auger electrons with energies below the photon energy +cutoff are not created, since such photons would be killed immediately and +such electrons cannot produce bremsstrahlung photons above the cutoff. Because +every particle emitted while filling a vacancy, as well as every vacancy left +behind, has an energy lower than the binding energy of the vacancy shell, the +cascade is not followed for vacancies whose binding energy is below the photon +energy cutoff. + .. _photon_production: diff --git a/src/photon.cpp b/src/photon.cpp index 72c970bc15f..d1ab9e9a398 100644 --- a/src/photon.cpp +++ b/src/photon.cpp @@ -935,10 +935,21 @@ void PhotonInteraction::atomic_relaxation(int i_shell, Particle& p) const // Push the initial hole onto the stack holes[n_holes++] = i_shell; + // Fluorescent photons below the photon energy cutoff are not created, and + // Auger electrons below it cannot produce bremsstrahlung photons above it, so + // emissions below the cutoff have no effect. Since every particle emitted + // while filling a hole, and every hole it leaves behind, has an energy less + // than the binding energy of that hole, holes whose binding energy is below + // the cutoff can be skipped along with the rest of their cascade. + double E_cutoff = + settings::energy_cutoff[ParticleType::photon().transport_index()]; + while (n_holes > 0) { // Pop the next hole off the stack int i_hole = holes[--n_holes]; const auto& shell {shells_[i_hole]}; + if (shell.binding_energy < E_cutoff) + continue; // If no transitions, assume fluorescent photon from captured free electron if (shell.transitions.empty()) { @@ -958,26 +969,28 @@ void PhotonInteraction::atomic_relaxation(int i_shell, Particle& p) const } const auto& transition = shell.transitions[i_trans]; - // Sample angle isotropically - Direction u = isotropic_direction(p.current_seed()); - // Push the hole created by the electron transitioning to the photoelectron // hole onto the stack holes[n_holes++] = transition.primary_subshell; - if (transition.secondary_subshell != -1) { - // Non-radiative transition -- Auger/Coster-Kronig effect - - // Push the hole left by emitted auger electron onto the stack + // Push the hole left by an emitted Auger electron onto the stack + bool auger = transition.secondary_subshell != -1; + if (auger) holes[n_holes++] = transition.secondary_subshell; - // Process Auger electron at the photon collision site. + if (transition.energy < E_cutoff) + continue; + + // Sample angle isotropically + Direction u = isotropic_direction(p.current_seed()); + + if (auger) { + // Non-radiative transition -- process Auger/Coster-Kronig electron at the + // photon collision site process_charged_secondary( p, u, transition.energy, ParticleType::electron()); } else { - // Radiative transition -- get X-ray energy - - // Create fluorescent photon + // Radiative transition -- create fluorescent photon p.create_secondary(p.wgt(), u, transition.energy, ParticleType::photon()); } } diff --git a/tests/regression_tests/photon_production/results_true.dat b/tests/regression_tests/photon_production/results_true.dat index a5ef842cb30..03a99458d06 100644 --- a/tests/regression_tests/photon_production/results_true.dat +++ b/tests/regression_tests/photon_production/results_true.dat @@ -1,8 +1,8 @@ tally 1: 8.610000E-01 7.413210E-01 -9.478000E-01 -8.983248E-01 +9.482000E-01 +8.990832E-01 0.000000E+00 0.000000E+00 0.000000E+00 @@ -16,12 +16,12 @@ tally 2: 1.573004E+00 4.296434E-04 1.845934E-07 -2.369187E-01 -5.613047E-02 +2.380469E-01 +5.666634E-02 0.000000E+00 0.000000E+00 -2.369187E-01 -5.613047E-02 +2.380469E-01 +5.666634E-02 0.000000E+00 0.000000E+00 0.000000E+00 @@ -53,16 +53,16 @@ tally 3: 4.104374E+12 4.296582E-04 1.846062E-07 -2.292000E-01 -5.253264E-02 -1.940924E+05 -3.767188E+10 +2.341000E-01 +5.480281E-02 +1.964630E+05 +3.859771E+10 0.000000E+00 0.000000E+00 -2.292000E-01 -5.253264E-02 -1.940924E+05 -3.767188E+10 +2.341000E-01 +5.480281E-02 +1.964630E+05 +3.859771E+10 0.000000E+00 0.000000E+00 0.000000E+00 @@ -102,16 +102,16 @@ tally 4: 4.104374E+12 0.000000E+00 0.000000E+00 -2.292000E-01 -5.253264E-02 -1.940924E+05 -3.767188E+10 +2.341000E-01 +5.480281E-02 +1.964630E+05 +3.859771E+10 0.000000E+00 0.000000E+00 -2.292000E-01 -5.253264E-02 -1.940924E+05 -3.767188E+10 +2.341000E-01 +5.480281E-02 +1.964630E+05 +3.859771E+10 0.000000E+00 0.000000E+00 0.000000E+00 diff --git a/tests/regression_tests/photon_production_fission/results_true.dat b/tests/regression_tests/photon_production_fission/results_true.dat index 7b665cdffbc..345e3451738 100644 --- a/tests/regression_tests/photon_production_fission/results_true.dat +++ b/tests/regression_tests/photon_production_fission/results_true.dat @@ -1,12 +1,12 @@ k-combined: -2.291054E+00 1.318367E-02 +2.222515E+00 3.969284E-02 tally 1: -2.680224E+00 -2.394796E+00 +2.601677E+00 +2.257489E+00 0.000000E+00 0.000000E+00 -2.680224E+00 -2.394796E+00 +2.601677E+00 +2.257489E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -18,52 +18,52 @@ tally 1: 0.000000E+00 0.000000E+00 tally 2: -2.689567E+00 -2.411293E+00 -4.327339E+08 -6.241987E+16 +2.621228E+00 +2.291426E+00 +4.221287E+08 +5.942978E+16 0.000000E+00 0.000000E+00 -2.689567E+00 -2.411293E+00 -4.327339E+08 -6.241987E+16 +2.621228E+00 +2.291426E+00 +4.221287E+08 +5.942978E+16 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.032424E+07 -8.441856E+14 +4.918160E+07 +8.069685E+14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.032424E+07 -8.441856E+14 +4.918160E+07 +8.069685E+14 0.000000E+00 0.000000E+00 tally 3: -2.654601E+00 -2.348975E+00 -4.327339E+08 -6.241987E+16 +2.662025E+00 +2.362162E+00 +4.221287E+08 +5.942978E+16 0.000000E+00 0.000000E+00 -2.654601E+00 -2.348975E+00 -4.327339E+08 -6.241987E+16 +2.662025E+00 +2.362162E+00 +4.221287E+08 +5.942978E+16 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.032424E+07 -8.441856E+14 +4.918160E+07 +8.069685E+14 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.032424E+07 -8.441856E+14 +4.918160E+07 +8.069685E+14 0.000000E+00 0.000000E+00 diff --git a/tests/regression_tests/photon_source/results_true.dat b/tests/regression_tests/photon_source/results_true.dat index cd3e43450a5..eb08fe71451 100644 --- a/tests/regression_tests/photon_source/results_true.dat +++ b/tests/regression_tests/photon_source/results_true.dat @@ -1,5 +1,5 @@ tally 1: -2.262129E+02 -5.117228E+04 +2.248870E+02 +5.057414E+04 0.000000E+00 0.000000E+00 diff --git a/tests/regression_tests/pulse_height/local_neutron/results_true.dat b/tests/regression_tests/pulse_height/local_neutron/results_true.dat index 7d28d5d442e..8c758810822 100644 --- a/tests/regression_tests/pulse_height/local_neutron/results_true.dat +++ b/tests/regression_tests/pulse_height/local_neutron/results_true.dat @@ -19,8 +19,8 @@ tally 1: 1.000000E-04 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 +0.000000E+00 +0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -59,8 +59,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -0.000000E+00 -0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 diff --git a/tests/regression_tests/pulse_height/local_photon/results_true.dat b/tests/regression_tests/pulse_height/local_photon/results_true.dat index 795f9b4c513..553cfc45822 100644 --- a/tests/regression_tests/pulse_height/local_photon/results_true.dat +++ b/tests/regression_tests/pulse_height/local_photon/results_true.dat @@ -1,8 +1,8 @@ tally 1: 4.120000E+00 3.409000E+00 -3.000000E-02 -5.000000E-04 +2.000000E-02 +2.000000E-04 1.000000E-02 1.000000E-04 0.000000E+00 @@ -29,34 +29,34 @@ tally 1: 2.000000E-04 2.000000E-02 4.000000E-04 -1.000000E-02 -1.000000E-04 +0.000000E+00 +0.000000E+00 0.000000E+00 0.000000E+00 2.000000E-02 2.000000E-04 -2.000000E-02 -2.000000E-04 +3.000000E-02 +3.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 +2.000000E-02 +2.000000E-04 2.000000E-02 2.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 1.000000E-04 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 +2.000000E-02 +2.000000E-04 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -69,14 +69,14 @@ tally 1: 0.000000E+00 1.000000E-02 1.000000E-04 -3.000000E-02 -3.000000E-04 2.000000E-02 2.000000E-04 -0.000000E+00 -0.000000E+00 2.000000E-02 2.000000E-04 +1.000000E-02 +1.000000E-04 +3.000000E-02 +3.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 @@ -89,14 +89,14 @@ tally 1: 1.000000E-04 1.000000E-02 1.000000E-04 -2.000000E-02 -2.000000E-04 -1.000000E-02 -1.000000E-04 1.000000E-02 1.000000E-04 +2.000000E-02 +2.000000E-04 1.000000E-02 1.000000E-04 +2.000000E-02 +2.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -107,22 +107,12 @@ tally 1: 2.000000E-04 0.000000E+00 0.000000E+00 -3.000000E-02 -5.000000E-04 -1.000000E-02 -1.000000E-04 -0.000000E+00 -0.000000E+00 +4.000000E-02 +6.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-02 -5.000000E-04 -3.000000E-02 -3.000000E-04 -0.000000E+00 -0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -131,42 +121,50 @@ tally 1: 1.000000E-04 1.000000E-02 1.000000E-04 -3.000000E-02 -5.000000E-04 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 +2.000000E-02 +2.000000E-04 +2.000000E-02 +2.000000E-04 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 1.000000E-04 -3.000000E-02 -5.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-02 -3.000000E-04 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -195,7 +193,9 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 -1.700000E-01 -5.900000E-03 +2.100000E-01 +1.070000E-02 diff --git a/tests/regression_tests/pulse_height/shared_neutron/results_true.dat b/tests/regression_tests/pulse_height/shared_neutron/results_true.dat index 7d28d5d442e..8c758810822 100644 --- a/tests/regression_tests/pulse_height/shared_neutron/results_true.dat +++ b/tests/regression_tests/pulse_height/shared_neutron/results_true.dat @@ -19,8 +19,8 @@ tally 1: 1.000000E-04 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 +0.000000E+00 +0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -59,8 +59,8 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -0.000000E+00 -0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 diff --git a/tests/regression_tests/pulse_height/shared_photon/results_true.dat b/tests/regression_tests/pulse_height/shared_photon/results_true.dat index 795f9b4c513..553cfc45822 100644 --- a/tests/regression_tests/pulse_height/shared_photon/results_true.dat +++ b/tests/regression_tests/pulse_height/shared_photon/results_true.dat @@ -1,8 +1,8 @@ tally 1: 4.120000E+00 3.409000E+00 -3.000000E-02 -5.000000E-04 +2.000000E-02 +2.000000E-04 1.000000E-02 1.000000E-04 0.000000E+00 @@ -29,34 +29,34 @@ tally 1: 2.000000E-04 2.000000E-02 4.000000E-04 -1.000000E-02 -1.000000E-04 +0.000000E+00 +0.000000E+00 0.000000E+00 0.000000E+00 2.000000E-02 2.000000E-04 -2.000000E-02 -2.000000E-04 +3.000000E-02 +3.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 +2.000000E-02 +2.000000E-04 2.000000E-02 2.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 1.000000E-04 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 +2.000000E-02 +2.000000E-04 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -69,14 +69,14 @@ tally 1: 0.000000E+00 1.000000E-02 1.000000E-04 -3.000000E-02 -3.000000E-04 2.000000E-02 2.000000E-04 -0.000000E+00 -0.000000E+00 2.000000E-02 2.000000E-04 +1.000000E-02 +1.000000E-04 +3.000000E-02 +3.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 @@ -89,14 +89,14 @@ tally 1: 1.000000E-04 1.000000E-02 1.000000E-04 -2.000000E-02 -2.000000E-04 -1.000000E-02 -1.000000E-04 1.000000E-02 1.000000E-04 +2.000000E-02 +2.000000E-04 1.000000E-02 1.000000E-04 +2.000000E-02 +2.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -107,22 +107,12 @@ tally 1: 2.000000E-04 0.000000E+00 0.000000E+00 -3.000000E-02 -5.000000E-04 -1.000000E-02 -1.000000E-04 -0.000000E+00 -0.000000E+00 +4.000000E-02 +6.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-02 -5.000000E-04 -3.000000E-02 -3.000000E-04 -0.000000E+00 -0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -131,42 +121,50 @@ tally 1: 1.000000E-04 1.000000E-02 1.000000E-04 -3.000000E-02 -5.000000E-04 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 +2.000000E-02 +2.000000E-04 +2.000000E-02 +2.000000E-04 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 1.000000E-04 -3.000000E-02 -5.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-02 -3.000000E-04 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -195,7 +193,9 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 -1.700000E-01 -5.900000E-03 +2.100000E-01 +1.070000E-02 diff --git a/tests/regression_tests/weightwindows/local/results_true.dat b/tests/regression_tests/weightwindows/local/results_true.dat index 0d218b9f0fe..c7e2fc00316 100644 --- a/tests/regression_tests/weightwindows/local/results_true.dat +++ b/tests/regression_tests/weightwindows/local/results_true.dat @@ -1 +1 @@ -bb0929835f7eac5b0974c2fb2753070665ab976c3a0265012dc739ac11515a2c9c02087bb6d0ba700174a4c25ba9a3b95a1aaf9bd704ec325d1243c09573ec81 \ No newline at end of file +f67f8fea2017aa7c8aaee8ec1e9fd3ae5728eb5d215f0fad36c31daf71f8497695b7f0e2b093ddf64d1cff088cc89750d8623d51fbc7fc325c2b53c5b5cc02e1 \ No newline at end of file diff --git a/tests/regression_tests/weightwindows/shared/results_true.dat b/tests/regression_tests/weightwindows/shared/results_true.dat index 6d1bb9789c5..0c5ef65f5af 100644 --- a/tests/regression_tests/weightwindows/shared/results_true.dat +++ b/tests/regression_tests/weightwindows/shared/results_true.dat @@ -1 +1 @@ -19b676a5e0f2784747d95fe884a44af3b31b4f5193e5ac514378d6d83cfa8ae9f4722da408a98b9b9cd3e369517d0b29bc523fd6f5492856f457e14d15007fa0 \ No newline at end of file +9c982466e8ac770834355981af1a8bcd8f922c9fab04ee4dbcf12c3fc171e2f02048b34f2519375b67099040fe200d1e30d40fa78e8507c1f72f6c2ee6fa4164 \ No newline at end of file diff --git a/tests/regression_tests/weightwindows_pulse_height/local/results_true.dat b/tests/regression_tests/weightwindows_pulse_height/local/results_true.dat index 795f9b4c513..553cfc45822 100644 --- a/tests/regression_tests/weightwindows_pulse_height/local/results_true.dat +++ b/tests/regression_tests/weightwindows_pulse_height/local/results_true.dat @@ -1,8 +1,8 @@ tally 1: 4.120000E+00 3.409000E+00 -3.000000E-02 -5.000000E-04 +2.000000E-02 +2.000000E-04 1.000000E-02 1.000000E-04 0.000000E+00 @@ -29,34 +29,34 @@ tally 1: 2.000000E-04 2.000000E-02 4.000000E-04 -1.000000E-02 -1.000000E-04 +0.000000E+00 +0.000000E+00 0.000000E+00 0.000000E+00 2.000000E-02 2.000000E-04 -2.000000E-02 -2.000000E-04 +3.000000E-02 +3.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 +2.000000E-02 +2.000000E-04 2.000000E-02 2.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 1.000000E-04 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 +2.000000E-02 +2.000000E-04 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -69,14 +69,14 @@ tally 1: 0.000000E+00 1.000000E-02 1.000000E-04 -3.000000E-02 -3.000000E-04 2.000000E-02 2.000000E-04 -0.000000E+00 -0.000000E+00 2.000000E-02 2.000000E-04 +1.000000E-02 +1.000000E-04 +3.000000E-02 +3.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 @@ -89,14 +89,14 @@ tally 1: 1.000000E-04 1.000000E-02 1.000000E-04 -2.000000E-02 -2.000000E-04 -1.000000E-02 -1.000000E-04 1.000000E-02 1.000000E-04 +2.000000E-02 +2.000000E-04 1.000000E-02 1.000000E-04 +2.000000E-02 +2.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -107,22 +107,12 @@ tally 1: 2.000000E-04 0.000000E+00 0.000000E+00 -3.000000E-02 -5.000000E-04 -1.000000E-02 -1.000000E-04 -0.000000E+00 -0.000000E+00 +4.000000E-02 +6.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-02 -5.000000E-04 -3.000000E-02 -3.000000E-04 -0.000000E+00 -0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -131,42 +121,50 @@ tally 1: 1.000000E-04 1.000000E-02 1.000000E-04 -3.000000E-02 -5.000000E-04 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 +2.000000E-02 +2.000000E-04 +2.000000E-02 +2.000000E-04 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 1.000000E-04 -3.000000E-02 -5.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-02 -3.000000E-04 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -195,7 +193,9 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 -1.700000E-01 -5.900000E-03 +2.100000E-01 +1.070000E-02 diff --git a/tests/regression_tests/weightwindows_pulse_height/shared/results_true.dat b/tests/regression_tests/weightwindows_pulse_height/shared/results_true.dat index 795f9b4c513..553cfc45822 100644 --- a/tests/regression_tests/weightwindows_pulse_height/shared/results_true.dat +++ b/tests/regression_tests/weightwindows_pulse_height/shared/results_true.dat @@ -1,8 +1,8 @@ tally 1: 4.120000E+00 3.409000E+00 -3.000000E-02 -5.000000E-04 +2.000000E-02 +2.000000E-04 1.000000E-02 1.000000E-04 0.000000E+00 @@ -29,34 +29,34 @@ tally 1: 2.000000E-04 2.000000E-02 4.000000E-04 -1.000000E-02 -1.000000E-04 +0.000000E+00 +0.000000E+00 0.000000E+00 0.000000E+00 2.000000E-02 2.000000E-04 -2.000000E-02 -2.000000E-04 +3.000000E-02 +3.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 +2.000000E-02 +2.000000E-04 2.000000E-02 2.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 1.000000E-04 -1.000000E-02 -1.000000E-04 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 +2.000000E-02 +2.000000E-04 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -69,14 +69,14 @@ tally 1: 0.000000E+00 1.000000E-02 1.000000E-04 -3.000000E-02 -3.000000E-04 2.000000E-02 2.000000E-04 -0.000000E+00 -0.000000E+00 2.000000E-02 2.000000E-04 +1.000000E-02 +1.000000E-04 +3.000000E-02 +3.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 @@ -89,14 +89,14 @@ tally 1: 1.000000E-04 1.000000E-02 1.000000E-04 -2.000000E-02 -2.000000E-04 -1.000000E-02 -1.000000E-04 1.000000E-02 1.000000E-04 +2.000000E-02 +2.000000E-04 1.000000E-02 1.000000E-04 +2.000000E-02 +2.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -107,22 +107,12 @@ tally 1: 2.000000E-04 0.000000E+00 0.000000E+00 -3.000000E-02 -5.000000E-04 -1.000000E-02 -1.000000E-04 -0.000000E+00 -0.000000E+00 +4.000000E-02 +6.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-02 -5.000000E-04 -3.000000E-02 -3.000000E-04 -0.000000E+00 -0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -131,42 +121,50 @@ tally 1: 1.000000E-04 1.000000E-02 1.000000E-04 -3.000000E-02 -5.000000E-04 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 +2.000000E-02 +2.000000E-04 +2.000000E-02 +2.000000E-04 +0.000000E+00 +0.000000E+00 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 1.000000E-02 1.000000E-04 -3.000000E-02 -5.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.000000E-02 -3.000000E-04 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.000000E-02 -1.000000E-04 0.000000E+00 0.000000E+00 0.000000E+00 @@ -195,7 +193,9 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 +1.000000E-02 +1.000000E-04 0.000000E+00 0.000000E+00 -1.700000E-01 -5.900000E-03 +2.100000E-01 +1.070000E-02 diff --git a/tests/unit_tests/weightwindows/test.py b/tests/unit_tests/weightwindows/test.py index fa8ca095fd3..cac005cc614 100644 --- a/tests/unit_tests/weightwindows/test.py +++ b/tests/unit_tests/weightwindows/test.py @@ -205,8 +205,8 @@ def compare_results(particle, analog_tally, ww_tally): diff = an_source_bin - ww_source_bin - # check that values are within two combined standard deviations - assert abs(diff.nominal_value) / diff.std_dev < 2.0 + # check that values are within three combined standard deviations + assert abs(diff.nominal_value) / diff.std_dev < 3.0 compare_results('neutron', analog_tally, ww_tally) compare_results('photon', analog_tally, ww_tally)