From 405717a3cf4b298e0367832faa90078cb75f77a2 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Fri, 14 Apr 2023 16:41:51 -0500 Subject: [PATCH 1/2] Modifying batch estimation message if the uncertainty ratio is inf --- src/tallies/trigger.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/tallies/trigger.cpp b/src/tallies/trigger.cpp index 79af658793..590a54773a 100644 --- a/src/tallies/trigger.cpp +++ b/src/tallies/trigger.cpp @@ -211,13 +211,18 @@ void check_triggers() auto n_pred_batches = static_cast(n_active * max_ratio * max_ratio) + settings::n_inactive + 1; - std::string msg = - fmt::format("The estimated number of batches is {}", n_pred_batches); - if (n_pred_batches > settings::n_max_batches) { - msg.append(" --- greater than max batches"); - warning(msg); - } else { + if (max_ratio == INFINITY) { + std::string msg = fmt::format("One or more tallies with triggers have no scores. Unable to estimate the number of remaining batches."); write_message(msg, 7); + } else { + std::string msg = + fmt::format("The estimated number of batches is {}", n_pred_batches); + if (n_pred_batches > settings::n_max_batches) { + msg.append(" --- greater than max batches"); + warning(msg); + } else { + write_message(msg, 7); + } } } } From f08510119c5a6cc6d9333e5153983dfdffe662ea Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Tue, 18 Apr 2023 00:38:33 -0500 Subject: [PATCH 2/2] Applying code formatter --- src/tallies/trigger.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/tallies/trigger.cpp b/src/tallies/trigger.cpp index 590a54773a..87f298baa1 100644 --- a/src/tallies/trigger.cpp +++ b/src/tallies/trigger.cpp @@ -39,7 +39,8 @@ std::pair get_tally_uncertainty( auto mean = sum / n; // if the result has no contributions, return an invalid pair - if (mean == 0) return {-1 , -1}; + if (mean == 0) + return {-1, -1}; double std_dev = std::sqrt((sum_sq / n - mean * mean) / (n - 1)); double rel_err = (mean != 0.) ? std_dev / std::abs(mean) : 0.; @@ -193,8 +194,10 @@ void check_triggers() keff_ratio); } else { if (tally_ratio == INFINITY) { - msg = fmt::format("Triggers unsatisfied, no result tallied for score {} in tally {}", reaction_name(score), tally_id); - } else{ + msg = fmt::format( + "Triggers unsatisfied, no result tallied for score {} in tally {}", + reaction_name(score), tally_id); + } else { msg = fmt::format( "Triggers unsatisfied, max unc./thresh. is {} for {} in tally {}", tally_ratio, reaction_name(score), tally_id); @@ -212,7 +215,9 @@ void check_triggers() settings::n_inactive + 1; if (max_ratio == INFINITY) { - std::string msg = fmt::format("One or more tallies with triggers have no scores. Unable to estimate the number of remaining batches."); + std::string msg = + fmt::format("One or more tallies with triggers have no scores. Unable " + "to estimate the number of remaining batches."); write_message(msg, 7); } else { std::string msg =