Make calibration optional

benchmarks/barrel_ecal/config.yml

@@ -40,7 +40,7 @@ calib:emcal_barrel_electrons:
   script:
     - ls -lhtR sim_output/
     - rootls -t sim_output/sim_emcal_barrel_electron.root
-    - root -b -q 'benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx+("electron")'
+    - root -b -q 'benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx+("electron", true)'
     - echo "JSON file(s) from analysis:" ; cat results/*.json
 
 bench:emcal_barrel_pions:
@@ -65,6 +65,7 @@ bench:emcal_barrel_pi0:
   needs:
     - ["sim:emcal_barrel_pi0", "calib:emcal_barrel_electrons"]
   script:
+    - echo "JSON file(s) from analysis:" ; cat results/*.json
     - root -b -q benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx+
 
 bench:emcal_barrel_photons:
@@ -75,8 +76,7 @@ bench:emcal_barrel_photons:
   script:
     - ls -lhtR sim_output/
     - rootls -t sim_output/sim_emcal_barrel_photon.root
-    - root -b -q 'benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx+("photon")'
-    - echo "JSON file(s) from analysis:" ; cat results/*.json
+    - root -b -q 'benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx+("photon", false)'
     - if [[ "$RUN_EXTENDED_BENCHMARK" == "true" ]] ; then root -b -q 'benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx+("photon")' ; fi
 
 bench:emcal_barrel_pions_electrons:

benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx

@@ -36,7 +36,7 @@ void save_canvas(TCanvas* c, std::string label, std::string particle_label)
   save_canvas(c, label_with_E);
 }
 
-void emcal_barrel_particles_analysis(std::string particle_name = "electron")
+void emcal_barrel_particles_analysis(std::string particle_name = "electron", bool save_calib = false)
 {
   // Setting for graphs
   gROOT->SetStyle("Plain");
@@ -173,7 +173,11 @@ void emcal_barrel_particles_analysis(std::string particle_name = "electron")
     {"thrown_energy", Ethr_mean},
     {"sampling_fraction", fSam_mean}
   };
-  std::ofstream o("results/emcal_barrel_particles_analyses.json");
+  if (save_calib) {
+    std::string calib_output_path = "results/emcal_barrel_calibration.json";
+    std::cout << "Saving calibration results to " << calib_output_path << std::endl;
+    std::ofstream o(calib_output_path);
     o << std::setw(4) << j << std::endl;
   }
+}
 

benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx

@@ -59,7 +59,7 @@ void emcal_barrel_pi0_analysis(const char* input_fname = "sim_output/sim_emcal_b
        {"target", std::to_string(resolutionTarget)}}};
 
   json j;
-  std::ifstream prev_steps_ifstream("results/emcal_barrel_particles_analyses.json");
+  std::ifstream prev_steps_ifstream("results/emcal_barrel_calibration.json");
   prev_steps_ifstream >> j;
 
   ROOT::EnableImplicitMT();