From 3cb54e9de10b660a7491a2a3be9332a9417eb680 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 25 Oct 2022 04:50:09 +0000
Subject: [PATCH] feat: rename EcalBarrelHits to EcalBarrelImagingHits
---
benchmarks/dis/analysis/rec_analysis_raw.cxx | 30 +++++++--------
options/reconstruction.py | 40 +++++++++++---------
options/reconstruction.raw.py | 30 +++++++++------
3 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/benchmarks/dis/analysis/rec_analysis_raw.cxx b/benchmarks/dis/analysis/rec_analysis_raw.cxx
index 98bd12e7..decd143f 100644
--- a/benchmarks/dis/analysis/rec_analysis_raw.cxx
+++ b/benchmarks/dis/analysis/rec_analysis_raw.cxx
@@ -87,47 +87,47 @@ int rec_analysis_raw(const std::string& config_name)
d0 = d0.Define("n_EcalBarrelImagingRawHits", "EcalBarrelImagingRawHits.size()")
.Define("n_EcalBarrelScFiRawHits", "EcalBarrelScFiRawHits.size()");
} else {
- d0 = d0.Define("n_EcalBarrelRawHits", "EcalBarrelRawHits.size()");
+ d0 = d0.Define("n_EcalBarrelSciGlassRawHits", "EcalBarrelSciGlassRawHits.size()");
}
// Ecal hits
auto h_n_EcalEndcapPRawHits = d0.Histo1D({"h_n_EcalEndcapPRawHits", "EcalEndcapP; hits; counts", 100, 0, 1000}, "n_EcalEndcapPRawHits");
- ROOT::RDF::RResultPtr<TH1D> h_n_EcalBarrelImagingRawHits, h_n_EcalBarrelScFiRawHits, h_n_EcalBarrelRawHits;
+ ROOT::RDF::RResultPtr<TH1D> h_n_EcalBarrelImagingRawHits, h_n_EcalBarrelScFiRawHits, h_n_EcalBarrelSciGlassRawHits;
if (d0.HasColumn("EcalBarrelScFiRawHits")) {
h_n_EcalBarrelImagingRawHits = d0.Histo1D({"h_n_EcalBarrelImagingRawHits", "EcalBarrelImaging; hits; counts", 100, 0, 1000}, "n_EcalBarrelImagingRawHits");
h_n_EcalBarrelScFiRawHits = d0.Histo1D({"h_n_EcalBarrelScFiRawHits", "EcalBarrelScFi; hits; counts", 100, 0, 10000}, "n_EcalBarrelScFiRawHits");
} else {
- h_n_EcalBarrelRawHits = d0.Histo1D({"h_n_EcalBarrelRawHits", "EcalBarrel; hits; counts", 100, 0, 1000}, "n_EcalBarrelRawHits");
+ h_n_EcalBarrelSciGlassRawHits = d0.Histo1D({"h_n_EcalBarrelSciGlassRawHits", "EcalBarrelSciGlas; hits; counts", 100, 0, 1000}, "n_EcalBarrelSciGlassRawHits");
}
auto h_n_EcalEndcapNRawHits = d0.Histo1D({"h_n_EcalEndcapNRawHits", "EcalEndcapN; hits; counts", 100, 0, 1000}, "n_EcalEndcapNRawHits");
// Ecal stats
auto stats_n_EcalEndcapPRawHits = d0.Stats("n_EcalEndcapPRawHits");
- ROOT::RDF::RResultPtr<TStatistic> stats_n_EcalBarrelImagingRawHits, stats_n_EcalBarrelScFiRawHits, stats_n_EcalBarrelRawHits;
+ ROOT::RDF::RResultPtr<TStatistic> stats_n_EcalBarrelImagingRawHits, stats_n_EcalBarrelScFiRawHits, stats_n_EcalBarrelSciGlassRawHits;
if (d0.HasColumn("EcalBarrelScFiRawHits")) {
stats_n_EcalBarrelImagingRawHits = d0.Stats("n_EcalBarrelImagingRawHits");
stats_n_EcalBarrelScFiRawHits = d0.Stats("n_EcalBarrelScFiRawHits");
} else {
- stats_n_EcalBarrelRawHits = d0.Stats("n_EcalBarrelRawHits");
+ stats_n_EcalBarrelSciGlassRawHits = d0.Stats("n_EcalBarrelSciGlassRawHits");
}
auto stats_n_EcalEndcapNRawHits = d0.Stats("n_EcalEndcapNRawHits");
// Ecal adc
auto h_adc_EcalEndcapPRawHits = d0.Histo1D({"h_adc_EcalEndcapPRawHits", "EcalEndcapP; amplitude; counts", 1024, 0, 32768}, "EcalEndcapPRawHits.amplitude");
- ROOT::RDF::RResultPtr<TH1D> h_adc_EcalBarrelImagingRawHits, h_adc_EcalBarrelScFiRawHits, h_adc_EcalBarrelRawHits;
+ ROOT::RDF::RResultPtr<TH1D> h_adc_EcalBarrelImagingRawHits, h_adc_EcalBarrelScFiRawHits, h_adc_EcalBarrelSciGlassRawHits;
if (d0.HasColumn("EcalBarrelScFiRawHits")) {
h_adc_EcalBarrelImagingRawHits = d0.Histo1D({"h_adc_EcalBarrelImagingRawHits", "EcalBarrelImaging; amplitude; counts", 1024, 0, 8192}, "EcalBarrelImagingRawHits.amplitude");
h_adc_EcalBarrelScFiRawHits = d0.Histo1D({"h_adc_EcalBarrelScFiRawHits", "EcalBarrelScFi; amplitude; counts", 1024, 0, 32768}, "EcalBarrelScFiRawHits.amplitude");
} else {
- h_adc_EcalBarrelRawHits = d0.Histo1D({"h_adc_EcalBarrelRawHits", "EcalBarrel; amplitude; counts", 1024, 0, 32768}, "EcalBarrelRawHits.amplitude");
+ h_adc_EcalBarrelSciGlassRawHits = d0.Histo1D({"h_adc_EcalBarrelSciGlassRawHits", "EcalBarrel; amplitude; counts", 1024, 0, 32768}, "EcalBarrelSciGlassRawHits.amplitude");
}
auto h_adc_EcalEndcapNRawHits = d0.Histo1D({"h_adc_EcalEndcapNRawHits", "EcalEndcapN; amplitude; counts", 1024, 0, 32768}, "EcalEndcapNRawHits.amplitude");
// Ecal tdc
auto h_tdc_EcalEndcapPRawHits = d0.Histo1D({"h_tdc_EcalEndcapPRawHits", "EcalEndcapP; TDC channel; counts", 1024, 0, 32768}, "EcalEndcapPRawHits.timeStamp");
- ROOT::RDF::RResultPtr<TH1D> h_tdc_EcalBarrelImagingRawHits, h_tdc_EcalBarrelScFiRawHits, h_tdc_EcalBarrelRawHits;
+ ROOT::RDF::RResultPtr<TH1D> h_tdc_EcalBarrelImagingRawHits, h_tdc_EcalBarrelScFiRawHits, h_tdc_EcalBarrelSciGlassRawHits;
if (d0.HasColumn("EcalBarrelScFiRawHits")) {
h_tdc_EcalBarrelImagingRawHits = d0.Histo1D({"h_tdc_EcalBarrelImagingRawHits", "EcalBarrelImaging; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelImagingRawHits.timeStamp");
h_tdc_EcalBarrelScFiRawHits = d0.Histo1D({"h_tdc_EcalBarrelScFiRawHits", "EcalBarrelScFi; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelScFiRawHits.timeStamp");
} else {
- h_tdc_EcalBarrelRawHits = d0.Histo1D({"h_tdc_EcalBarrelRawHits", "EcalBarrel; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelRawHits.timeStamp");
+ h_tdc_EcalBarrelSciGlassRawHits = d0.Histo1D({"h_tdc_EcalBarrelSciGlassRawHits", "EcalBarrel; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelSciGlassRawHits.timeStamp");
}
auto h_tdc_EcalEndcapNRawHits = d0.Histo1D({"h_tdc_EcalEndcapNRawHits", "EcalEndcapN; TDC channel; counts", 1024, 0, 32768}, "EcalEndcapNRawHits.timeStamp");
// Hcal hits
@@ -182,8 +182,8 @@ int rec_analysis_raw(const std::string& config_name)
fmt::print("EcalBarrelScFiRawHits:");
stats_n_EcalBarrelScFiRawHits->Print();
} else {
- fmt::print("EcalBarrelRawHits:");
- stats_n_EcalBarrelRawHits->Print();
+ fmt::print("EcalBarrelSciGlassRawHits:");
+ stats_n_EcalBarrelSciGlassRawHits->Print();
}
fmt::print("EcalEndcapNRawHits:");
stats_n_EcalEndcapNRawHits->Print();
@@ -306,7 +306,7 @@ int rec_analysis_raw(const std::string& config_name)
} else {
c.cd(3);
gPad->SetLogy(true);
- auto& h3 = *h_n_EcalBarrelRawHits;
+ auto& h3 = *h_n_EcalBarrelSciGlassRawHits;
// histogram style
h3.SetLineColor(common_bench::plot::kMpBlue);
h3.SetLineWidth(2);
@@ -378,7 +378,7 @@ int rec_analysis_raw(const std::string& config_name)
} else {
c.cd(3);
gPad->SetLogy(true);
- auto& h3 = *h_adc_EcalBarrelRawHits;
+ auto& h3 = *h_adc_EcalBarrelSciGlassRawHits;
// histogram style
h3.SetLineColor(common_bench::plot::kMpBlue);
h3.SetLineWidth(2);
@@ -451,7 +451,7 @@ int rec_analysis_raw(const std::string& config_name)
} else {
c.cd(3);
gPad->SetLogy(true);
- auto& h3 = *h_tdc_EcalBarrelRawHits;
+ auto& h3 = *h_tdc_EcalBarrelSciGlassRawHits;
// histogram style
h3.SetLineColor(common_bench::plot::kMpBlue);
h3.SetLineWidth(2);
@@ -612,7 +612,7 @@ int rec_analysis_raw(const std::string& config_name)
(
! d0.HasColumn("EcalBarrelScFiRawHits") &&
(
- stats_n_EcalBarrelRawHits->GetMean() < 0.1
+ stats_n_EcalBarrelSciGlassRawHits->GetMean() < 0.1
)
) ||
stats_n_EcalEndcapNRawHits->GetMean() < 0.1 ||
diff --git a/options/reconstruction.py b/options/reconstruction.py
index 785e7c65..d9298276 100644
--- a/options/reconstruction.py
+++ b/options/reconstruction.py
@@ -14,13 +14,13 @@ detector_config = str(os.environ.get("DETECTOR_CONFIG", detector_name))
detector_version = str(os.environ.get("DETECTOR_VERSION", "main"))
# Detector features that affect reconstruction
-has_ecal_barrel_scfi = False
+has_ecal_barrel_imaging = False
has_pid_backward_pfrich = False
if "epic" in detector_name and "imaging" in detector_config:
- has_ecal_barrel_scfi = True
+ has_ecal_barrel_imaging = True
has_pid_backward_pfrich = True
if "epic" in detector_name and "brycecanyon" in detector_config:
- has_ecal_barrel_scfi = True
+ has_ecal_barrel_imaging = True
has_pid_backward_pfrich = True
if "PBEAM" in os.environ:
@@ -206,8 +206,6 @@ sim_coll = [
"EcalEndcapNHitsContributions",
"EcalEndcapPHits",
"EcalEndcapPHitsContributions",
- "EcalBarrelHits",
- "EcalBarrelHitsContributions",
"HcalBarrelHits",
"HcalBarrelHitsContributions",
"HcalEndcapPHits",
@@ -220,12 +218,20 @@ sim_coll = [
"ZDCHcalHits",
"ZDCHcalHitsContributions",
]
-ecal_barrel_scfi_collections = [
+ecal_barrel_imaging_collections = [
+ "EcalBarrelImagingHits",
+ "EcalBarrelImagingHitsContributions",
"EcalBarrelScFiHits",
"EcalBarrelScFiHitsContributions",
]
-if has_ecal_barrel_scfi:
- sim_coll += ecal_barrel_scfi_collections
+ecal_barrel_sciglass_collections = [
+ "EcalBarrelSciGlassHits",
+ "EcalBarrelSciGlassHitsContributions",
+]
+if has_ecal_barrel_imaging:
+ sim_coll += ecal_barrel_imaging_collections
+else:
+ sim_coll += ecal_barrel_sciglass_collections
forward_romanpot_collections = [
"ForwardRomanPotHits",
@@ -568,13 +574,13 @@ ci_ecal_clmerger = ClusterMerger(
algorithms.append(ci_ecal_clmerger)
# Central Barrel Ecal
-if has_ecal_barrel_scfi:
+if has_ecal_barrel_imaging:
# Central ECAL Imaging Calorimeter
img_barrel_daq = calo_daq["ecal_barrel_imaging"]
img_barrel_digi = CalHitDigi(
"img_barrel_digi",
- inputHitCollection="EcalBarrelHits",
+ inputHitCollection="EcalBarrelImagingHits",
outputHitCollection="EcalBarrelImagingRawHits",
energyResolutions=[0.0, 0.02, 0.0], # 2% flat resolution
**img_barrel_daq,
@@ -587,7 +593,7 @@ if has_ecal_barrel_scfi:
outputHitCollection="EcalBarrelImagingRecHits",
thresholdFactor=3, # about 20 keV
samplingFraction=img_barrel_sf,
- readoutClass="EcalBarrelHits", # readout class
+ readoutClass="EcalBarrelImagingHits", # readout class
layerField="layer", # field to get layer id
sectorField="module", # field to get sector id
**img_barrel_daq,
@@ -695,8 +701,8 @@ else:
sciglass_ecal_digi = CalHitDigi(
"sciglass_ecal_digi",
- inputHitCollection="EcalBarrelHits",
- outputHitCollection="EcalBarrelHitsDigi",
+ inputHitCollection="EcalBarrelSciGlassHits",
+ outputHitCollection="EcalBarrelSciGlassHitsDigi",
energyResolutions=[0.0, 0.02, 0.0], # 2% flat resolution
**sciglass_ecal_daq,
)
@@ -705,9 +711,9 @@ else:
sciglass_ecal_reco = CalHitReco(
"sciglass_ecal_reco",
inputHitCollection=sciglass_ecal_digi.outputHitCollection,
- outputHitCollection="EcalBarrelHitsReco",
+ outputHitCollection="EcalBarrelSciGlassHitsReco",
thresholdFactor=3, # about 20 keV
- readoutClass="EcalBarrelHits", # readout class
+ readoutClass="EcalBarrelSciGlassHits", # readout class
sectorField="sector", # field to get sector id
samplingFraction=0.998, # this accounts for a small fraction of leakage
**sciglass_ecal_daq,
@@ -716,7 +722,7 @@ else:
sciglass_ecal_cl = TruthClustering(
"sciglass_ecal_cl",
- mcHits="EcalBarrelHits",
+ mcHits="EcalBarrelSciGlassHits",
inputHits=sciglass_ecal_reco.outputHitCollection,
outputProtoClusters="EcalBarrelTruthProtoClusters",
)
@@ -735,7 +741,7 @@ else:
sciglass_ecal_clreco = RecoCoG(
"sciglass_ecal_clreco",
- mcHits="EcalBarrelHits",
+ mcHits="EcalBarrelSciGlassHits",
inputProtoClusterCollection=sciglass_ecal_cl.outputProtoClusters,
outputClusterCollection="EcalBarrelClusters",
outputAssociations="EcalBarrelClustersAssoc",
diff --git a/options/reconstruction.raw.py b/options/reconstruction.raw.py
index 99d88a2e..8348dd58 100644
--- a/options/reconstruction.raw.py
+++ b/options/reconstruction.raw.py
@@ -12,13 +12,13 @@ detector_config = str(os.environ.get("DETECTOR_CONFIG", detector_name))
detector_version = str(os.environ.get("DETECTOR_VERSION", "main"))
# Detector features that affect reconstruction
-has_ecal_barrel_scfi = False
+has_ecal_barrel_imaging = False
has_pid_backward_pfrich = False
if "epic" in detector_name and "imaging" in detector_config:
- has_ecal_barrel_scfi = True
+ has_ecal_barrel_imaging = True
has_pid_backward_pfrich = True
if "epic" in detector_name and "brycecanyon" in detector_config:
- has_ecal_barrel_scfi = True
+ has_ecal_barrel_imaging = True
has_pid_backward_pfrich = True
# RICH reconstruction
@@ -82,8 +82,6 @@ sim_coll = [
"EcalEndcapNHitsContributions",
"EcalEndcapPHits",
"EcalEndcapPHitsContributions",
- "EcalBarrelHits",
- "EcalBarrelHitsContributions",
"HcalBarrelHits",
"HcalBarrelHitsContributions",
"HcalEndcapPHits",
@@ -92,12 +90,20 @@ sim_coll = [
"HcalEndcapNHitsContributions",
"DRICHHits",
]
-ecal_barrel_scfi_collections = [
+ecal_barrel_imaging_collections = [
+ "EcalBarrelImagingHits",
+ "EcalBarrelImagingHitsContributions",
"EcalBarrelScFiHits",
"EcalBarrelScFiHitsContributions",
]
-if has_ecal_barrel_scfi:
- sim_coll += ecal_barrel_scfi_collections
+ecal_barrel_sciglass_collections = [
+ "EcalBarrelSciGlassHits",
+ "EcalBarrelSciGlassHitsContributions",
+]
+if has_ecal_barrel_imaging:
+ sim_coll += ecal_barrel_imaging_collections
+else:
+ sim_coll += ecal_barrel_sciglass_collections
forward_romanpot_collections = [
"ForwardRomanPotHits",
@@ -202,13 +208,13 @@ ci_ecal_digi = CalHitDigi(
algorithms.append(ci_ecal_digi)
# Central Barrel Ecal
-if has_ecal_barrel_scfi:
+if has_ecal_barrel_imaging:
# Central ECAL Imaging Calorimeter
img_barrel_daq = calo_daq["ecal_barrel_imaging"]
img_barrel_digi = CalHitDigi(
"img_barrel_digi",
- inputHitCollection="EcalBarrelHits",
+ inputHitCollection="EcalBarrelImagingHits",
outputHitCollection="EcalBarrelImagingRawHits",
energyResolutions=[0.0, 0.02, 0.0], # 2% flat resolution
**img_barrel_daq
@@ -231,8 +237,8 @@ else:
sciglass_ecal_digi = CalHitDigi(
"sciglass_ecal_digi",
- inputHitCollection="EcalBarrelHits",
- outputHitCollection="EcalBarrelRawHits",
+ inputHitCollection="EcalBarrelSciGlassHits",
+ outputHitCollection="EcalBarrelSciGlassRawHits",
energyResolutions=[0.0, 0.02, 0.0], # 2% flat resolution
**sciglass_ecal_daq
)
--
GitLab