diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx index ad6e057ac084bcd48fa56f391b7c81ef2eaae2ef..683ae5be2258a80b62987767350e29f8e8534d76 100644 --- a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx +++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx @@ -257,7 +257,7 @@ void emcal_barrel_particles_analysis(std::string particle_name = "electron", boo {"sampling_fraction_error_scfi", fSam_scfi_mean_err} }; if (save_calib) { - std::string calib_output_path = "results/emcal_barrel_calibration.json"; + std::string calib_output_path = fmt::format("results/emcal_barrel_{}_calibration.json", particle_name); std::cout << "Saving calibration results to " << calib_output_path << std::endl; std::ofstream o(calib_output_path); o << std::setw(4) << j << std::endl; diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx index 6d4a51ef9881d80785a7915459fc4f7cdbfa1c41..55354fe16cd1b1f0d5391c64f46195018b340065 100644 --- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx +++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx @@ -49,9 +49,8 @@ void emcal_barrel_pi0_analysis( ROOT::RDataFrame d0("events", input_fname); // Sampling Fraction grabbed from json file - // Note that this value is derived from electrons json j; - std::ifstream prev_steps_ifstream("results/emcal_barrel_calibration.json"); + std::ifstream prev_steps_ifstream("results/emcal_barrel_electron_calibration.json"); prev_steps_ifstream >> j; double samp_frac = j["electron"]["sampling_fraction"]; 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 279505549673804af4c5031c106e9ea3273e2de6..836810f391f1b99b42d9f6c5e9cd7d0bc7aa48a2 100644 --- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx +++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx @@ -87,9 +87,8 @@ void emcal_barrel_pion_rejection_analysis( /* // Sampling Fraction grabbed from json file - // Note that this value is derived from electrons json j; - std::ifstream prev_steps_ifstream("results/emcal_barrel_calibration.json"); + std::ifstream prev_steps_ifstream("results/emcal_barrel_electron_calibration.json"); prev_steps_ifstream >> j; // Sampling Fraction