From 29b70515a4be875c71f3692901dd48765921226d Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Wed, 17 Nov 2021 19:51:43 +0000
Subject: [PATCH] naming consistency
---
options/reconstruction.ecal.py | 4 ++--
options/reconstruction.py | 12 ++++++------
options/reconstruction.raw.py | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/options/reconstruction.ecal.py b/options/reconstruction.ecal.py
index 3229614d..f80282ae 100644
--- a/options/reconstruction.ecal.py
+++ b/options/reconstruction.ecal.py
@@ -76,7 +76,7 @@ podin = PodioInput("PodioReader", collections=sim_coll)
algorithms.append(podin)
# Crystal Endcap Ecal
-ce_calo_daq = calo_daq['ecal_neg_endcap']
+ce_ecal_daq = calo_daq['ecal_neg_endcap']
ce_ecal_digi = CalHitDigi("ce_ecal_digi",
inputHitCollection="EcalEndcapNHits",
@@ -114,7 +114,7 @@ ce_ecal_clreco = RecoCoG("ce_ecal_clreco",
algorithms.append(ce_ecal_clreco)
# Endcap Sampling Ecal
-ci_calo_daq = calo_daq['ecal_pos_endcap']
+ci_ecal_daq = calo_daq['ecal_pos_endcap']
ci_ecal_digi = CalHitDigi("ci_ecal_digi",
inputHitCollection="EcalEndcapPHits",
diff --git a/options/reconstruction.py b/options/reconstruction.py
index a48e74ce..d26e800e 100644
--- a/options/reconstruction.py
+++ b/options/reconstruction.py
@@ -228,12 +228,12 @@ trk_b0_reco = TrackerHitReconstruction("trk_b0_reco",
algorithms.append(trk_b0_reco)
# Crystal Endcap Ecal
-ce_calo_daq = calo_daq['ecal_neg_endcap']
+ce_ecal_daq = calo_daq['ecal_neg_endcap']
ce_ecal_digi = CalHitDigi("ce_ecal_digi",
inputHitCollection="EcalEndcapNHits",
outputHitCollection="EcalEndcapNRawHits",
energyResolutions=[0., 0.02, 0.],
- **ce_calo_daq)
+ **ce_ecal_daq)
algorithms.append(ce_ecal_digi)
ce_ecal_reco = CalHitReco("ce_ecal_reco",
@@ -242,7 +242,7 @@ ce_ecal_reco = CalHitReco("ce_ecal_reco",
thresholdFactor=4, # 4 sigma cut on pedestal sigma
readoutClass="EcalEndcapNHits",
sectorField="sector",
- **ce_calo_daq)
+ **ce_ecal_daq)
algorithms.append(ce_ecal_reco)
ce_ecal_cl = IslandCluster("ce_ecal_cl",
@@ -271,19 +271,19 @@ ce_ecal_clmerger = ClusterMerger("ce_ecal_clmerger",
algorithms.append(ce_ecal_clmerger)
# Endcap Sampling Ecal
-ci_calo_daq = calo_daq['ecal_pos_endcap']
+ci_ecal_daq = calo_daq['ecal_pos_endcap']
ci_ecal_digi = CalHitDigi("ci_ecal_digi",
inputHitCollection="EcalEndcapPHits",
outputHitCollection="EcalEndcapPRawHits",
- **ci_calo_daq)
+ **ci_ecal_daq)
algorithms.append(ci_ecal_digi)
ci_ecal_reco = CalHitReco("ci_ecal_reco",
inputHitCollection=ci_ecal_digi.outputHitCollection,
outputHitCollection="EcalEndcapPRecHits",
thresholdFactor=5.0,
- **ci_calo_daq)
+ **ci_ecal_daq)
algorithms.append(ci_ecal_reco)
# merge hits in different layer (projection to local x-y plane)
diff --git a/options/reconstruction.raw.py b/options/reconstruction.raw.py
index a655501d..62665bcd 100644
--- a/options/reconstruction.raw.py
+++ b/options/reconstruction.raw.py
@@ -115,7 +115,7 @@ trk_b0_digi = TrackerDigi("trk_b0_digi",
algorithms.append(trk_b0_digi)
# Crystal Endcap Ecal
-ce_calo_daq = calo_daq['ecal_neg_endcap']
+ce_ecal_daq = calo_daq['ecal_neg_endcap']
ce_ecal_digi = CalHitDigi("ce_ecal_digi",
inputHitCollection="EcalEndcapNHits",
@@ -125,7 +125,7 @@ ce_ecal_digi = CalHitDigi("ce_ecal_digi",
algorithms.append(ce_ecal_digi)
# Endcap Sampling Ecal
-ci_calo_daq = calo_daq['ecal_pos_endcap']
+ci_ecal_daq = calo_daq['ecal_pos_endcap']
ci_ecal_digi = CalHitDigi("ci_ecal_digi",
inputHitCollection="EcalEndcapPHits",
--
GitLab