diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx index 21e01af3affcb8129ee9260c51b7dab719b82343..7ff5a6457d14e6d86d4573ca385305d924d40208 100644 --- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx +++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx @@ -262,19 +262,11 @@ void emcal_barrel_pion_rejection_analysis( {"title", "Pion Rejection1"}, {"description", fmt::format("Pion rejection with E = {}, and {}", (int)E[0], etaTitle[2])}, {"quantity", "pi-/e-"}, - {"target", [std::to_string(suppression * maxRate[0][2]), std::to_string(suppression * maxRate[0][3])]}, - {"value", [std::to_string(rejRatios[0][2]), std::to_string(rejRatios[0][3])]} - }/*, - {{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[0], 3)}, - {"title", "Pion Rejection2"}, - {"description", fmt::format("Pion rejection with E = {}, and {}", (int)E[0], etaTitle[3])}, - {"quantity", "pi-/e-"}, - {"target", std::to_string(suppression * maxRate[0][3])}, - {"value", std::to_string(rejRatios[0][3])} - }*/ + {"target", std::to_string(suppression * maxRate[0][2])}, + {"value", std::to_string(rejRatios[0][2])} + } }; - eic::util::write_test({pion_rejection_E18_Eta2}, fmt::format("results/{}_pion_rej.json", detector)); -/* + // E, Eta = 18, 3 eic::util::Test pion_rejection_E18_Eta3{ {{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[0], 3)}, @@ -285,9 +277,8 @@ void emcal_barrel_pion_rejection_analysis( {"value", std::to_string(rejRatios[0][3])} } }; - eic::util::write_test({pion_rejection_E18_Eta3}, fmt::format("results/{}_pion_rej.json", detector)); - // E, Eta = 10, 2 + // E, Eta = 10, 2 eic::util::Test pion_rejection_E10_Eta2{ {{"name", fmt::format("{}_E{}_EtaBin{}", test_tag, (int)E[1], 2)}, {"title", "Pion Rejection"}, @@ -297,7 +288,6 @@ void emcal_barrel_pion_rejection_analysis( {"value", std::to_string(rejRatios[1][2])} } }; - eic::util::write_test({pion_rejection_E10_Eta2}, fmt::format("results/{}_pion_rej.json", detector)); // E, Eta = 10, 3 eic::util::Test pion_rejection_E10_Eta3{ @@ -309,7 +299,6 @@ void emcal_barrel_pion_rejection_analysis( {"value", std::to_string(rejRatios[1][3])} } }; - eic::util::write_test({pion_rejection_E10_Eta3}, fmt::format("results/{}_pion_rej.json", detector)); // E, Eta = 5, 2 eic::util::Test pion_rejection_E5_Eta2{ @@ -321,7 +310,6 @@ void emcal_barrel_pion_rejection_analysis( {"value", std::to_string(rejRatios[2][2])} } }; - eic::util::write_test({pion_rejection_E10_Eta2}, fmt::format("results/{}_pion_rej.json", detector)); // E, Eta = 5, 3 eic::util::Test pion_rejection_E5_Eta3{ @@ -333,6 +321,13 @@ void emcal_barrel_pion_rejection_analysis( {"value", std::to_string(rejRatios[2][3])} } }; - eic::util::write_test({pion_rejection_E10_Eta3}, fmt::format("results/{}_pion_rej.json", detector)); -*/ + // Writing out all tests + eic::util::write_test({pion_rejection_E18_Eta2, + pion_rejection_E18_Eta3, + pion_rejection_E10_Eta2, + pion_rejection_E10_Eta3, + pion_rejection_E5_Eta2, + pion_rejection_E5_Eta3}, + fmt::format("results/{}_pion_rej.json", detector)); + }