From f7b9e2b7c0be254b8b2a8420620def8b14e751d6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 10 Oct 2023 18:01:45 -0400
Subject: [PATCH] emcal_barrel_particles_analysis.cxx: require particle name in
_calibration.json file
---
.../barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx | 2 +-
benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx | 3 +--
.../scripts/emcal_barrel_pion_rejection_analysis.cxx | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
index ad6e057a..683ae5be 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 6d4a51ef..55354fe1 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 27950554..836810f3 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
--
GitLab