From 4bdc3d8ea407c94e432acca46eba944a5dd0d285 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 25 Oct 2022 21:33:58 +0000
Subject: [PATCH] feat: rename EcalBarrelHits to EcalBarrelImagingHits
---
.../emcal_barrel_energy_scan_analysis.cxx | 8 ++++----
.../emcal_barrel_particles_analysis.cxx | 7 ++++---
.../scripts/emcal_barrel_pi0_analysis.cxx | 7 ++++---
.../emcal_barrel_pion_rejection_analysis.cxx | 18 +++++++++---------
.../scripts/emcal_barrel_pions_analysis.cxx | 7 ++++---
.../hcal_barrel_energy_scan_analysis.cxx | 11 +++++++----
6 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
index b417a3c6..f4938c2a 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
@@ -78,15 +78,15 @@ std::tuple <double, double, double, double> extract_sampling_fraction_parameters
};
// Energy deposited in layers
- auto decoder = detector.readout("EcalBarrelHits").idSpec().decoder();
+ auto decoder = detector.readout("EcalBarrelImagingHits").idSpec().decoder();
fmt::print("{}\n", decoder->fieldDescription());
auto layer_index = decoder->index("layer");
fmt::print(" layer index is {}.\n", layer_index);
// Define variables
auto d1 = d0.Define("Ethr", Ethr, {"MCParticles"})
- .Define("nhits", nhits, {"EcalBarrelHits"})
- .Define("EsimImg", Esim, {"EcalBarrelHits"})
+ .Define("nhits", nhits, {"EcalBarrelImagingHits"})
+ .Define("EsimImg", Esim, {"EcalBarrelImagingHits"})
.Define("EsimScFi", Esim, {"EcalBarrelScFiHits"})
.Define("Esim", "EsimImg+EsimScFi")
.Define("fsam", fsam, {"Esim", "Ethr"});
@@ -127,7 +127,7 @@ std::tuple <double, double, double, double> extract_sampling_fraction_parameters
return layer_edep;
};
- auto d2 = d0.Define(fmt::format("EsimImg_layer_{}",layer).c_str(), Esim_layer, {"EcalBarrelHits"})
+ auto d2 = d0.Define(fmt::format("EsimImg_layer_{}",layer).c_str(), Esim_layer, {"EcalBarrelImagingHits"})
.Define(fmt::format("EsimScFi_layer_{}",layer).c_str(), Esim_layer, {"EcalBarrelScFiHits"})
.Define(fmt::format("Esim_layer_{}",layer).c_str(), fmt::format("EsimImg_layer_{}+EsimScFi_layer_{}",layer,layer).c_str());
std::cout << "Layer to process: " << layer << std::endl;
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
index 3bba7389..ad6e057a 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
@@ -102,13 +102,13 @@ void emcal_barrel_particles_analysis(std::string particle_name = "electron", boo
// Define variables
auto d1 = ROOT::RDF::RNode(
d0.Define("Ethr", Ethr, {"MCParticles"})
- .Define("nhits", nhits, {"EcalBarrelHits"})
);
// Define optional variables
auto fsam_estimate = 1.0;
if (d1.HasColumn("EcalBarrelScFiHits")) {
- d1 = d1.Define("EsimImg", Esim, {"EcalBarrelHits"})
+ d1 = d1.Define("nhits", nhits, {"EcalBarrelImagingHits"})
+ .Define("EsimImg", Esim, {"EcalBarrelImagingHits"})
.Define("EsimScFi", Esim, {"EcalBarrelScFiHits"})
.Define("Esim", "EsimImg+EsimScFi")
.Define("fsamImg", fsam, {"EsimImg", "Ethr"})
@@ -116,7 +116,8 @@ void emcal_barrel_particles_analysis(std::string particle_name = "electron", boo
.Define("fsam", fsam, {"Esim", "Ethr"});
fsam_estimate = 0.1;
} else {
- d1 = d1.Define("Esim", Esim, {"EcalBarrelHits"})
+ d1 = d1.Define("nhits", nhits, {"EcalBarrelSciGlassHits"})
+ .Define("Esim", Esim, {"EcalBarrelSciGlassHits"})
.Define("fsam", fsam, {"Esim", "Ethr"});
fsam_estimate = 1.0;
}
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
index b904f3cf..00de2393 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_analysis.cxx
@@ -102,13 +102,13 @@ void emcal_barrel_pi0_analysis(
d0.Define("Ethr", Ethr, {"MCParticles"})
.Define("pid", getpid, {"MCParticles"})
.Define("dau", getdau, {"MCParticles"})
- .Define("nhits", nhits, {"EcalBarrelHits"})
);
auto Ethr_max = 7.5;
auto fsam_est = 1.0;
if (d1.HasColumn("EcalBarrelScFiHits")) {
- d1 = d1.Define("EsimImg", Esim, {"EcalBarrelHits"})
+ d1 = d1.Define("nhits", nhits, {"EcalBarrelImagingHits"})
+ .Define("EsimImg", Esim, {"EcalBarrelImagingHits"})
.Define("EsimScFi", Esim, {"EcalBarrelScFiHits"})
.Define("Esim", "EsimImg+EsimScFi")
.Define("fsamImg", fsam, {"EsimImg", "Ethr"})
@@ -116,7 +116,8 @@ void emcal_barrel_pi0_analysis(
.Define("fsam", fsam, {"Esim", "Ethr"});
fsam_est = 1.2*samp_frac;
} else {
- d1 = d1.Define("Esim", Esim, {"EcalBarrelHits"})
+ d1 = d1.Define("nhits", nhits, {"EcalBarrelSciGlassHits"})
+ .Define("Esim", Esim, {"EcalBarrelSciGlassHits"})
.Define("fsam", fsam, {"Esim", "Ethr"});
fsam_est = 1.0;
}
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 ef19294b..27950554 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
@@ -105,7 +105,7 @@ void emcal_barrel_pion_rejection_analysis(
dd4hep::Detector& detector = dd4hep::Detector::getInstance();
detector.fromCompact(fmt::format("{}/{}.xml", detector_path, detector_name));
- auto decoder = detector.readout("EcalBarrelHits").idSpec().decoder();
+ auto decoder = detector.readout("EcalBarrelImagingHits").idSpec().decoder();
auto decoderScFi = detector.readout("EcalBarrelScFiHits").idSpec().decoder();
auto layer_index = decoder->index("layer");
auto layer_indexScFi = decoderScFi->index("layer");
@@ -310,8 +310,8 @@ void emcal_barrel_pion_rejection_analysis(
// Define variables
auto d1 = d0.Define("Ethr", Ethr, {"MCParticles"})
.Define("Pthr", Pthr, {"MCParticles"})
- .Define("nhits", nhits, {"EcalBarrelHits"})
- .Define("Esim", Esim, {"EcalBarrelHits"})
+ .Define("nhits", nhits, {"EcalBarrelImagingHits"})
+ .Define("Esim", Esim, {"EcalBarrelImagingHits"})
.Define("EsimScFi", Esim, {"EcalBarrelScFiHits"})
.Define("EsimOverP", fEp, {"Esim", "Pthr"})
.Define("EsimScFiOverP", fEp, {"EsimScFi", "Pthr"})
@@ -319,14 +319,14 @@ void emcal_barrel_pion_rejection_analysis(
.Define("EsimTotOverP", fEp, {"EsimTot", "Pthr"})
.Define("fsam", fsam, {"Esim","Ethr"})
.Define("pid", getpid, {"MCParticles"})
- .Define("EDep", Esim_dep, {"EcalBarrelHits"})
+ .Define("EDep", Esim_dep, {"EcalBarrelImagingHits"})
.Define("EDepSum", Esim_dep_sum, {"EDep"})
.Define("EDepN", Esim_depN, {"EDep"})
- .Define("EDep2", Esim_dep2, {"EcalBarrelHits"})
- .Define("EDep3", Esim_dep3, {"EcalBarrelHits"})
- .Define("EDep4", Esim_dep4, {"EcalBarrelHits"})
- .Define("EDep5", Esim_dep5, {"EcalBarrelHits"})
- .Define("EDep6", Esim_dep6, {"EcalBarrelHits"})
+ .Define("EDep2", Esim_dep2, {"EcalBarrelImagingHits"})
+ .Define("EDep3", Esim_dep3, {"EcalBarrelImagingHits"})
+ .Define("EDep4", Esim_dep4, {"EcalBarrelImagingHits"})
+ .Define("EDep5", Esim_dep5, {"EcalBarrelImagingHits"})
+ .Define("EDep6", Esim_dep6, {"EcalBarrelImagingHits"})
.Define("EDep6OverP", fEp, {"EDep6", "Pthr"})
.Define("EOverP", fEp, {"EDep3", "Pthr"})
.Define("Eta", Eta, {"MCParticles"})
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx
index 1fff8811..121f6163 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_analysis.cxx
@@ -89,14 +89,14 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
// Define variables
auto d1 = ROOT::RDF::RNode(
d0.Define("Ethr", Ethr, {"MCParticles"})
- .Define("nhits", nhits, {"EcalBarrelHits"})
.Define("pid", getpid, {"MCParticles"})
);
auto Ethr_max = 7.5;
auto fsam_est = 1.0;
if (d1.HasColumn("EcalBarrelScFiHits")) {
- d1 = d1.Define("EsimImg", Esim, {"EcalBarrelHits"})
+ d1 = d1.Define("nhits", nhits, {"EcalBarrelImagingHits"})
+ .Define("EsimImg", Esim, {"EcalBarrelImagingHits"})
.Define("EsimScFi", Esim, {"EcalBarrelScFiHits"})
.Define("Esim", "EsimImg+EsimScFi")
.Define("fsamImg", fsam, {"EsimImg", "Ethr"})
@@ -104,7 +104,8 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
.Define("fsam", fsam, {"Esim", "Ethr"});
fsam_est = 0.1;
} else {
- d1 = d1.Define("Esim", Esim, {"EcalBarrelHits"})
+ d1 = d1.Define("nhits", nhits, {"EcalBarrelSciGlassHits"})
+ .Define("Esim", Esim, {"EcalBarrelSciGlassHits"})
.Define("fsam", fsam, {"Esim", "Ethr"});
fsam_est = 1.0;
}
diff --git a/benchmarks/barrel_hcal/scripts/hcal_barrel_energy_scan_analysis.cxx b/benchmarks/barrel_hcal/scripts/hcal_barrel_energy_scan_analysis.cxx
index 7226b7fd..03c8af99 100644
--- a/benchmarks/barrel_hcal/scripts/hcal_barrel_energy_scan_analysis.cxx
+++ b/benchmarks/barrel_hcal/scripts/hcal_barrel_energy_scan_analysis.cxx
@@ -75,17 +75,20 @@ std::tuple <double, double, double, double> extract_sampling_fraction_parameters
};
// Define variables
- auto d1 = d0.Define("Ethr", Ethr, {"MCParticles"})
- .Define("nhits", nhits, {"EcalBarrelHits"})
- .Define("Esim", Esim, {"EcalBarrelHits"})
- .Define("fsam", fsam, {"Esim", "Ethr"});
+ auto d1 = d0.Define("Ethr", Ethr, {"MCParticles"});
// Define assumptions
auto Ethr_max = 25.0;
auto fsam_estimate = 1.0;
if (d1.HasColumn("EcalBarrelScFiHits")) {
+ d1 = d1.Define("nhits", nhits, {"EcalBarrelImagingHits"})
+ .Define("Esim", Esim, {"EcalBarrelImagingHits"})
+ .Define("fsam", fsam, {"Esim", "Ethr"});
fsam_estimate = 0.1;
} else {
+ d1 = d1.Define("nhits", nhits, {"EcalBarrelSciGlassHits"})
+ .Define("Esim", Esim, {"EcalBarrelSciGlassHits"})
+ .Define("fsam", fsam, {"Esim", "Ethr"});
fsam_estimate = 1.0;
}
--
GitLab