From 0f16cd6e220e85e57e7a7224b3e16dcebf01f6c6 Mon Sep 17 00:00:00 2001
From: Marshall Scott <mbscott@anl.gov>
Date: Tue, 22 Jun 2021 17:35:12 -0400
Subject: [PATCH] First commit
---
.../scripts/emcal_barrel_pi0_analysis.cxx | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
index 3fa30561..9bcf4af6 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
@@ -95,7 +95,7 @@ void emcal_barrel_pi0_analysis(const char* input_fname = "sim_output/sim_emcal_b
};
// Energy Resolution = Esampling/Sampling_fraction - Ethrown
- auto eResol = [samp_frac](const std::vector<double>& sampled, const std::vector<double>& thrown) {
+ auto eResol = [&samp_frac](const std::vector<double>& sampled, const std::vector<double>& thrown) {
std::vector<double> result;
auto it_sam = sampled.cbegin();
auto it_thr = thrown.cbegin();
@@ -106,7 +106,7 @@ void emcal_barrel_pi0_analysis(const char* input_fname = "sim_output/sim_emcal_b
};
// Relative Energy Resolution = (Esampling/Sampling fraction - Ethrown)/Ethrown
- auto eResol_rel = [samp_frac](const std::vector<double>& sampled, const std::vector<double>& thrown) {
+ auto eResol_rel = [&samp_frac](const std::vector<double>& sampled, const std::vector<double>& thrown) {
std::vector<double> result;
auto it_sam = sampled.cbegin();
auto it_thr = thrown.cbegin();
@@ -220,11 +220,7 @@ void emcal_barrel_pi0_analysis(const char* input_fname = "sim_output/sim_emcal_b
double sigmaOverE = res[2] / thrown_energy;
//Pass/Fail
- if (sigmaOverE <= resolutionTarget) {
- pi0_energy_resolution.pass(sigmaOverE);
- } else {
- pi0_energy_resolution.fail(sigmaOverE);
- }
+ sigmaOverE <= resolutionTarget ? pi0_energy_resolution.pass(sigmaOverE) : pi0_energy_resolution.fail(sigmaOverE);
//std::printf("Energy Resolution is %f\n", res[2]);
//Energy Resolution Histogram Plotting
@@ -247,7 +243,7 @@ void emcal_barrel_pi0_analysis(const char* input_fname = "sim_output/sim_emcal_b
cdE_rel->SaveAs("results/emcal_barrel_pi0_dE_rel.png");
cdE_rel->SaveAs("results/emcal_barrel_pi0_dE_rel.pdf");
- eic::util::write_test({pi0_energy_resolution}, fmt::format("{}_pi0.json", detector));
+ eic::util::write_test({pi0_energy_resolution}, fmt::format("results/{}_pi0.json", detector));
}
--
GitLab