From f365027c6dcf0bfa16cd3f10ad450d363280cbe8 Mon Sep 17 00:00:00 2001
From: Maria Zurek <zurek@anl.gov>
Date: Tue, 17 Aug 2021 22:20:12 +0000
Subject: [PATCH] Resolve "Clarify EcalBarrel clusters naming in full
simulation outputs"
---
benchmarks/clustering/full_cal_clusters.sh | 2 +-
.../clustering/options/full_cal_reco.py | 12 +++---
benchmarks/ecal/options/barrel.py | 12 +++---
benchmarks/ecal/run_emcal_benchmarks.py | 4 +-
.../full/options/full_reconstruction.py | 42 +++++++++----------
.../imaging_ecal/options/hybrid_cluster.py | 12 +++---
.../imaging_ecal/options/imaging_2dcluster.py | 12 +++---
.../options/imaging_topocluster.py | 12 +++---
benchmarks/imaging_ecal/run_emcal_barrel.sh | 2 +-
benchmarks/imaging_ecal/run_imcal_pion0.sh | 2 +-
.../imaging_ecal/scripts/draw_cluster.py | 2 +-
.../scripts/draw_cluster_layers.py | 2 +-
.../imaging_ecal/scripts/energy_profile.py | 2 +-
.../imaging_ecal/scripts/epi_separation.py | 2 +-
benchmarks/imaging_ecal/scripts/utils.py | 6 +--
15 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/benchmarks/clustering/full_cal_clusters.sh b/benchmarks/clustering/full_cal_clusters.sh
index d30f08fb..ee6d64c6 100644
--- a/benchmarks/clustering/full_cal_clusters.sh
+++ b/benchmarks/clustering/full_cal_clusters.sh
@@ -130,7 +130,7 @@ fi
# Run analysis scripts
FULL_CAL_SCRIPT_DIR=benchmarks/clustering/scripts
python ${FULL_CAL_SCRIPT_DIR}/cluster_plots.py ${JUGGLER_SIM_FILE} ${JUGGLER_REC_FILE} -o results \
- --collections "EcalEndcapNClusters, EcalEndcapPClusters, EcalBarrelClusters,
+ --collections "EcalEndcapNClusters, EcalEndcapPClusters, EcalBarrelImagingClusters,
HcalEndcapNClusters, HcalEndcapPClusters, HcalBarrelClusters"
root_filesize=$(stat --format=%s "${JUGGLER_REC_FILE}")
diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py
index 5e66e82b..e757b3bf 100644
--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/benchmarks/clustering/options/full_cal_reco.py
@@ -162,13 +162,13 @@ cb_ecal_daq = dict(
cb_ecal_digi = CalHitDigi("cb_ecal_digi",
inputHitCollection="EcalBarrelHits",
- outputHitCollection="EcalBarrelHitsDigi",
+ outputHitCollection="EcalBarrelImagingHitsDigi",
energyResolutions=[0., 0.02, 0.], # 2% flat resolution
**cb_ecal_daq)
cb_ecal_reco = ImCalPixelReco("cb_ecal_reco",
inputHitCollection=cb_ecal_digi.outputHitCollection,
- outputHitCollection="EcalBarrelHitsReco",
+ outputHitCollection="EcalBarrelImagingHitsReco",
thresholdFactor=3, # about 20 keV
readoutClass="EcalBarrelHits", # readout class
layerField="layer", # field to get layer id
@@ -177,7 +177,7 @@ cb_ecal_reco = ImCalPixelReco("cb_ecal_reco",
cb_ecal_cl = ImagingCluster("cb_ecal_cl",
inputHitCollection=cb_ecal_reco.outputHitCollection,
- outputProtoClusterCollection="EcalBarrelProtoClusters",
+ outputProtoClusterCollection="EcalBarrelImagingProtoClusters",
localDistXY=[2.*mm, 2*mm], # same layer
layerDistEtaPhi=[10*mrad, 10*mrad], # adjacent layer
neighbourLayersRange=2, # id diff for adjacent layer
@@ -187,9 +187,9 @@ cb_ecal_clreco = ImagingClusterReco("cb_ecal_clreco",
samplingFraction=cb_ecal_sf,
inputHitCollection=cb_ecal_cl.inputHitCollection,
inputProtoClusterCollection=cb_ecal_cl.outputProtoClusterCollection,
- outputClusterCollection="EcalBarrelClusters",
- outputInfoCollection="EcalBarrelClustersInfo",
- outputLayerCollection="EcalBarrelLayers")
+ outputClusterCollection="EcalBarrelImagingClusters",
+ outputInfoCollection="EcalBarrelImagingClustersInfo",
+ outputLayerCollection="EcalBarrelImagingLayers")
#Central ECAL SciFi
# use the same daq_setting for digi/reco pair
diff --git a/benchmarks/ecal/options/barrel.py b/benchmarks/ecal/options/barrel.py
index a7d22cda..b78eb191 100644
--- a/benchmarks/ecal/options/barrel.py
+++ b/benchmarks/ecal/options/barrel.py
@@ -59,13 +59,13 @@ cb_ecal_daq = dict(
cb_ecal_digi = CalHitDigi("cb_ecal_digi",
inputHitCollection="EcalBarrelHits",
- outputHitCollection="EcalBarrelHitsDigi",
+ outputHitCollection="EcalBarrelImagingHitsDigi",
energyResolutions=[0., 0.02, 0.], # 2% flat resolution
**cb_ecal_daq)
cb_ecal_reco = ImCalPixelReco("cb_ecal_reco",
inputHitCollection=cb_ecal_digi.outputHitCollection,
- outputHitCollection="EcalBarrelHitsReco",
+ outputHitCollection="EcalBarrelImagingHitsReco",
thresholdFactor=3, # about 20 keV
readoutClass="EcalBarrelHits", # readout class
layerField="layer", # field to get layer id
@@ -74,7 +74,7 @@ cb_ecal_reco = ImCalPixelReco("cb_ecal_reco",
cb_ecal_cl = ImagingCluster("cb_ecal_cl",
inputHitCollection=cb_ecal_reco.outputHitCollection,
- outputProtoClusterCollection="EcalBarrelProtoClusters",
+ outputProtoClusterCollection="EcalBarrelImagingProtoClusters",
localDistXY=[2.*mm, 2*mm], # same layer
layerDistEtaPhi=[10*mrad, 10*mrad], # adjacent layer
neighbourLayersRange=2, # id diff for adjacent layer
@@ -84,9 +84,9 @@ cb_ecal_clreco = ImagingClusterReco("cb_ecal_clreco",
samplingFraction=cb_ecal_sf,
inputHitCollection=cb_ecal_cl.inputHitCollection,
inputProtoClusterCollection=cb_ecal_cl.outputProtoClusterCollection,
- outputClusterCollection="EcalBarrelClusters",
- outputLayerCollection="EcalBarrelLayers",
- outputInfoCollection="EcalBarrelClustersInfo")
+ outputClusterCollection="EcalBarrelImagingClusters",
+ outputLayerCollection="EcalBarrelImagingLayers",
+ outputInfoCollection="EcalBarrelImagingClustersInfo")
podout.outputCommands = ['drop *',
'keep mcparticles2',
diff --git a/benchmarks/ecal/run_emcal_benchmarks.py b/benchmarks/ecal/run_emcal_benchmarks.py
index 2380e404..c70ca0be 100755
--- a/benchmarks/ecal/run_emcal_benchmarks.py
+++ b/benchmarks/ecal/run_emcal_benchmarks.py
@@ -24,11 +24,11 @@ default_type = {
'barrel': [
['barrel.py'],
['draw_clusters.py'],
- ['EcalBarrelClusters']],
+ ['EcalBarrelImagingClusters']],
# 'all': [
# ['all_ecal.py'],
# ['draw_clusters.py'],
-# ['EcalEndcapNClusters', 'EcalEndcapPClusters', 'EcalBarrelClusters']],
+# ['EcalEndcapNClusters', 'EcalEndcapPClusters', 'EcalBarrelImagingClusters']],
}
default_compact = os.path.join(os.environ.get('DETECTOR_PATH', os.environ.get('DETECTOR_PATH', '')),
diff --git a/benchmarks/full/options/full_reconstruction.py b/benchmarks/full/options/full_reconstruction.py
index a4791272..c3296890 100644
--- a/benchmarks/full/options/full_reconstruction.py
+++ b/benchmarks/full/options/full_reconstruction.py
@@ -32,7 +32,7 @@ with open('config/emcal_barrel_calibration.json') as f:
print(calib_data)
-cb_ecal_sf = float(calib_data['sampling_fraction_img'])
+img_barrel_sf = float(calib_data['sampling_fraction_img'])
scifi_barrel_sf = float(calib_data['sampling_fraction_scfi'])
# input and output
@@ -222,42 +222,42 @@ ci_ecal_clreco = RecoCoG("ci_ecal_clreco",
samplingFraction=ci_ecal_sf)
# Central Barrel Ecal (Imaging Cal.)
-cb_ecal_daq = dict(
+img_barrel_daq = dict(
dynamicRangeADC=3*units.MeV,
capacityADC=8192,
pedestalMean=400,
pedestalSigma=20) # about 6 keV
-cb_ecal_digi = CalHitDigi("cb_ecal_digi",
+img_barrel_digi = CalHitDigi("img_barrel_digi",
inputHitCollection="EcalBarrelHits",
- outputHitCollection="EcalBarrelHitsDigi",
+ outputHitCollection="EcalBarrelImagingHitsDigi",
energyResolutions=[0., 0.02, 0.], # 2% flat resolution
- **cb_ecal_daq)
+ **img_barrel_daq)
-cb_ecal_reco = ImCalPixelReco("cb_ecal_reco",
- inputHitCollection=cb_ecal_digi.outputHitCollection,
- outputHitCollection="EcalBarrelHitsReco",
+img_barrel_reco = ImCalPixelReco("img_barrel_reco",
+ inputHitCollection=img_barrel_digi.outputHitCollection,
+ outputHitCollection="EcalBarrelImagingHitsReco",
thresholdFactor=3, # about 20 keV
readoutClass="EcalBarrelHits", # readout class
layerField="layer", # field to get layer id
sectorField="module", # field to get sector id
- **cb_ecal_daq)
+ **img_barrel_daq)
-cb_ecal_cl = ImagingCluster("cb_ecal_cl",
- inputHitCollection=cb_ecal_reco.outputHitCollection,
- outputProtoClusterCollection="EcalBarrelProtoClusters",
+img_barrel_cl = ImagingCluster("img_barrel_cl",
+ inputHitCollection=img_barrel_reco.outputHitCollection,
+ outputProtoClusterCollection="EcalBarrelImagingProtoClusters",
localDistXY=[2.*units.mm, 2*units.mm], # same layer
layerDistEtaPhi=[10*units.mrad, 10*units.mrad], # adjacent layer
neighbourLayersRange=2, # id diff for adjacent layer
sectorDist=3.*units.cm) # different sector
-cb_ecal_clreco = ImagingClusterReco("cb_ecal_clreco",
- samplingFraction=cb_ecal_sf,
- inputHitCollection=cb_ecal_cl.inputHitCollection,
- inputProtoClusterCollection=cb_ecal_cl.outputProtoClusterCollection,
- outputClusterCollection="EcalBarrelClusters",
- outputInfoCollection="EcalBarrelClustersInfo",
- outputLayerCollection="EcalBarrelLayers")
+img_barrel_clreco = ImagingClusterReco("img_barrel_clreco",
+ samplingFraction=img_barrel_sf,
+ inputHitCollection=img_barrel_cl.inputHitCollection,
+ inputProtoClusterCollection=img_barrel_cl.outputProtoClusterCollection,
+ outputClusterCollection="EcalBarrelImagingClusters",
+ outputInfoCollection="EcalBarrelImagingClustersInfo",
+ outputLayerCollection="EcalBarrelImagingLayers")
# Central ECAL SciFi
scfi_barrel_daq = dict(
@@ -499,7 +499,7 @@ truth_trk_init = TrackParamTruthInit("truth_trk_init",
#vtxcluster_trk_init = TrackParamVertexClusterInit("vtxcluster_trk_init",
# inputVertexHits="VertexBarrelRecHits",
-# inputClusters="EcalBarrelClusters",
+# inputClusters="EcalBarrelImagingClusters",
# outputInitialTrackParameters="InitTrackParamsFromVtxClusters",
# maxHitRadius=40.0*units.mm)
@@ -568,7 +568,7 @@ ApplicationMgr(
ecal_digi, ecal_reco, #simple_cluster,
ce_ecal_digi, ce_ecal_reco, ce_ecal_cl, ce_ecal_clreco,
ci_ecal_digi, ci_ecal_reco, ci_ecal_merger, ci_ecal_cl, ci_ecal_clreco,
- cb_ecal_digi, cb_ecal_reco, cb_ecal_cl, cb_ecal_clreco,
+ img_barrel_digi, img_barrel_reco, img_barrel_cl, img_barrel_clreco,
scfi_barrel_digi, scfi_barrel_reco, scfi_barrel_merger, scfi_barrel_cl, scfi_barrel_clreco,
cb_hcal_digi, cb_hcal_reco, cb_hcal_merger, cb_hcal_cl, cb_hcal_clreco,
ce_hcal_digi, ce_hcal_reco, ce_hcal_merger, ce_hcal_cl, ce_hcal_clreco,
diff --git a/benchmarks/imaging_ecal/options/hybrid_cluster.py b/benchmarks/imaging_ecal/options/hybrid_cluster.py
index 4f91158d..21fef284 100644
--- a/benchmarks/imaging_ecal/options/hybrid_cluster.py
+++ b/benchmarks/imaging_ecal/options/hybrid_cluster.py
@@ -65,13 +65,13 @@ imcaldaq = dict(
imcaldigi = CalHitDigi('imcal_digi',
# OutputLevel=DEBUG,
inputHitCollection='EcalBarrelHits',
- outputHitCollection='DigiEcalBarrelHits',
+ outputHitCollection='DigiEcalBarrelImagingHits',
energyResolutions=[0., 0.02, 0.],
**imcaldaq)
imcalreco = ImagingPixelReco('imcal_reco',
# OutputLevel=DEBUG,
inputHitCollection=imcaldigi.outputHitCollection,
- outputHitCollection='RecoEcalBarrelHits',
+ outputHitCollection='RecoEcalBarrelImagingHits',
readoutClass='EcalBarrelHits',
layerField='layer',
sectorField='module',
@@ -80,7 +80,7 @@ imcalreco = ImagingPixelReco('imcal_reco',
imcalcluster = ImagingTopoCluster('imcal_cluster',
# OutputLevel=DEBUG,
inputHitCollection=imcalreco.outputHitCollection,
- outputProtoClusterCollection='EcalBarrelProtoClusters',
+ outputProtoClusterCollection='EcalBarrelImagingProtoClusters',
localDistXY=[2.*mm, 2*mm],
layerDistEtaPhi=[10*mrad, 10*mrad],
neighbourLayersRange=2,
@@ -89,9 +89,9 @@ clusterreco = ImagingClusterReco('imcal_clreco',
# OutputLevel=DEBUG,
inputHitCollection=imcalcluster.inputHitCollection,
inputProtoClusterCollection=imcalcluster.outputProtoClusterCollection,
- outputLayerCollection='EcalBarrelClustersLayers',
- outputClusterCollection='EcalBarrelClusters',
- outputInfoCollection='EcalBarrelClustersInfo',
+ outputLayerCollection='EcalBarrelImagingClustersLayers',
+ outputClusterCollection='EcalBarrelImagingClusters',
+ outputInfoCollection='EcalBarrelImagingClustersInfo',
samplingFraction=kwargs['img_sf'])
# scfi layers
diff --git a/benchmarks/imaging_ecal/options/imaging_2dcluster.py b/benchmarks/imaging_ecal/options/imaging_2dcluster.py
index d2a038ca..cf0a1794 100644
--- a/benchmarks/imaging_ecal/options/imaging_2dcluster.py
+++ b/benchmarks/imaging_ecal/options/imaging_2dcluster.py
@@ -53,12 +53,12 @@ imcal_barrel_daq = dict(
imcal_barrel_digi = CalHitDigi('imcal_barrel_digi',
inputHitCollection='EcalBarrelHits',
- outputHitCollection='EcalBarrelHitsDigi',
+ outputHitCollection='EcalBarrelImagingHitsDigi',
**imcal_barrel_daq)
imcal_barrel_reco = CalHitReco('imcal_barrel_reco',
inputHitCollection=imcal_barrel_digi.outputHitCollection,
- outputHitCollection='EcalBarrelHitsReco',
+ outputHitCollection='EcalBarrelImagingHitsReco',
thresholdFactor=5.0,
readoutClass='EcalBarrelHits',
localDetFields=['system', 'module'], # use local coordinates in each module (stave)
@@ -68,13 +68,13 @@ imcal_barrel_reco = CalHitReco('imcal_barrel_reco',
imcal_barrel_merger = CalHitsProj('imcal_barrel_merger',
# OutputLevel=DEBUG,
inputHitCollection=imcal_barrel_reco.outputHitCollection,
- outputHitCollection='EcalBarrelHitsMerge',
+ outputHitCollection='EcalBarrelImagingHitsMerge',
gridSizes=[0.004, 0.004*rad])
imcal_barrel_cl = IslandCluster('imcal_barrel_cl',
# OutputLevel=DEBUG,
inputHitCollection=imcal_barrel_merger.outputHitCollection,
- outputProtoClusterCollection='EcalBarrelProtoClusters',
+ outputProtoClusterCollection='EcalBarrelImagingProtoClusters',
minClusterCenterEdep=1.*MeV,
minClusterHitEdep=0.1*MeV,
splitCluster=True,
@@ -84,8 +84,8 @@ imcal_barrel_clreco = RecoCoG('imcal_barrel_clreco',
# OutputLevel=DEBUG,
inputHitCollection=imcal_barrel_cl.inputHitCollection,
inputProtoClusterCollection = imcal_barrel_cl.outputProtoClusterCollection,
- outputClusterCollection='EcalBarrelClusters',
- outputInfoCollection='EcalBarrelClustersInfo',
+ outputClusterCollection='EcalBarrelImagingClusters',
+ outputInfoCollection='EcalBarrelImagingClustersInfo',
logWeightBase=6.2,
samplingFraction=kwargs['img_sf'])
diff --git a/benchmarks/imaging_ecal/options/imaging_topocluster.py b/benchmarks/imaging_ecal/options/imaging_topocluster.py
index 94901baa..2ce1fc9a 100644
--- a/benchmarks/imaging_ecal/options/imaging_topocluster.py
+++ b/benchmarks/imaging_ecal/options/imaging_topocluster.py
@@ -58,13 +58,13 @@ daq_setting = dict(
imcaldigi = CalorimeterHitDigi("imcal_digi",
# OutputLevel=DEBUG,
inputHitCollection="EcalBarrelHits",
- outputHitCollection="DigiEcalBarrelHits",
+ outputHitCollection="DigiEcalBarrelImagingHits",
energyResolutions=[0., 0.02, 0.],
**daq_setting)
imcalreco = ImagingPixelReco("imcal_reco",
# OutputLevel=DEBUG,
inputHitCollection=imcaldigi.outputHitCollection,
- outputHitCollection="RecoEcalBarrelHits",
+ outputHitCollection="RecoEcalBarrelImagingHits",
readoutClass="EcalBarrelHits",
layerField="layer",
sectorField="module",
@@ -73,7 +73,7 @@ imcalreco = ImagingPixelReco("imcal_reco",
imcalcluster = ImagingTopoCluster("imcal_cluster",
# OutputLevel=DEBUG,
inputHitCollection=imcalreco.outputHitCollection,
- outputProtoClusterCollection="EcalBarrelProtoClusters",
+ outputProtoClusterCollection="EcalBarrelImagingProtoClusters",
localDistXY=[2.*units.mm, 2*units.mm],
layerDistEtaPhi=[10*units.mrad, 10*units.mrad],
neighbourLayersRange=2,
@@ -83,9 +83,9 @@ clusterreco = ImagingClusterReco("imcal_clreco",
# OutputLevel=DEBUG,
inputHitCollection=imcalcluster.inputHitCollection,
inputProtoClusterCollection=imcalcluster.outputProtoClusterCollection,
- outputLayerCollection="EcalBarrelClustersLayers",
- outputClusterCollection="EcalBarrelClusters",
- outputInfoCollection="EcalBarrelClustersInfo",
+ outputLayerCollection="EcalBarrelImagingClustersLayers",
+ outputClusterCollection="EcalBarrelImagingClusters",
+ outputInfoCollection="EcalBarrelImagingClustersInfo",
samplingFraction=sf)
out.outputCommands = ["keep *"]
diff --git a/benchmarks/imaging_ecal/run_emcal_barrel.sh b/benchmarks/imaging_ecal/run_emcal_barrel.sh
index 0dca31e5..843e0feb 100644
--- a/benchmarks/imaging_ecal/run_emcal_barrel.sh
+++ b/benchmarks/imaging_ecal/run_emcal_barrel.sh
@@ -116,7 +116,7 @@ fi
# Plot clusters first
FULL_CAL_SCRIPT_DIR=benchmarks/clustering/scripts
python ${FULL_CAL_SCRIPT_DIR}/cluster_plots.py ${CB_EMCAL_SIM_FILE} ${CB_EMCAL_REC_FILE} -o results \
- --collections "EcalBarrelClusters, EcalBarrelScFiClusters"
+ --collections "EcalBarrelImagingClusters, EcalBarrelScFiClusters"
# check required python modules
python -m pip install -r benchmarks/imaging_ecal/requirements.txt
diff --git a/benchmarks/imaging_ecal/run_imcal_pion0.sh b/benchmarks/imaging_ecal/run_imcal_pion0.sh
index 9506c117..cac64c8c 100644
--- a/benchmarks/imaging_ecal/run_imcal_pion0.sh
+++ b/benchmarks/imaging_ecal/run_imcal_pion0.sh
@@ -111,7 +111,7 @@ fi
# Plot clusters first
FULL_CAL_SCRIPT_DIR=benchmarks/clustering/scripts
python ${FULL_CAL_SCRIPT_DIR}/cluster_plots.py ${CB_EMCAL_SIM_FILE} ${CB_EMCAL_REC_FILE} -o results \
- --collections "EcalBarrelClusters"
+ --collections "EcalBarrelImagingClusters"
root_filesize=$(stat --format=%s "${CB_EMCAL_REC_FILE}")
if [[ "${CB_EMCAL_NUMEV}" -lt "500" ]] ; then
diff --git a/benchmarks/imaging_ecal/scripts/draw_cluster.py b/benchmarks/imaging_ecal/scripts/draw_cluster.py
index f810b6a9..6dedc2f6 100644
--- a/benchmarks/imaging_ecal/scripts/draw_cluster.py
+++ b/benchmarks/imaging_ecal/scripts/draw_cluster.py
@@ -105,7 +105,7 @@ if __name__ == '__main__':
parser.add_argument('--compact', type=str, default='', dest='compact', help='compact file')
parser.add_argument('-m', '--macros', type=str, default='rootlogon.C', dest='macros',
help='root macros to load (accept multiple paths separated by \",\")')
- parser.add_argument('-b', '--branch-name', type=str, default='RecoEcalBarrelHits', dest='branch',
+ parser.add_argument('-b', '--branch-name', type=str, default='RecoEcalBarrelImagingHits', dest='branch',
help='branch name in the root file (outputLayerCollection from ImagingClusterReco)')
parser.add_argument('--topo-size', type=float, default=2.0, dest='topo_size',
help='bin size for projection plot (mrad)')
diff --git a/benchmarks/imaging_ecal/scripts/draw_cluster_layers.py b/benchmarks/imaging_ecal/scripts/draw_cluster_layers.py
index 13a8eb1b..b0a06b12 100644
--- a/benchmarks/imaging_ecal/scripts/draw_cluster_layers.py
+++ b/benchmarks/imaging_ecal/scripts/draw_cluster_layers.py
@@ -57,7 +57,7 @@ if __name__ == '__main__':
parser.add_argument('--compact', type=str, default='', dest='compact', help='compact file')
parser.add_argument('-m', '--macros', type=str, default='rootlogon.C', dest='macros',
help='root macros to load (accept multiple paths separated by \",\")')
- parser.add_argument('-b', '--branch-name', type=str, default='RecoEcalBarrelHits', dest='branch',
+ parser.add_argument('-b', '--branch-name', type=str, default='RecoEcalBarrelImagingHits', dest='branch',
help='branch name in the root file (outputLayerCollection from ImagingClusterReco)')
parser.add_argument('--topo-size', type=float, default=2.0, dest='topo_size',
help='bin size for projection plot (mrad)')
diff --git a/benchmarks/imaging_ecal/scripts/energy_profile.py b/benchmarks/imaging_ecal/scripts/energy_profile.py
index a8406f0c..081e79cc 100644
--- a/benchmarks/imaging_ecal/scripts/energy_profile.py
+++ b/benchmarks/imaging_ecal/scripts/energy_profile.py
@@ -35,7 +35,7 @@ if __name__ == '__main__':
parser.add_argument('-e', '--energy', type=float, default=5., dest='energy', help='incident particle energy (GeV)')
parser.add_argument('-s', '--save', type=str, default='', dest='save', help='path to save profile')
parser.add_argument('-c', '--color', type=str, default='royalblue', dest='color', help='colors for bar plots')
- parser.add_argument('-b', '--branch-name', type=str, default='EcalBarrelClustersLayers', dest='branch',
+ parser.add_argument('-b', '--branch-name', type=str, default='EcalBarrelImagingClustersLayers', dest='branch',
help='branch name in the root file (outputLayerCollection from ImagingClusterReco)')
parser.add_argument('-m', '--macros', type=str, default='rootlogon.C', dest='macros',
help='root macros to load (accept multiple paths separated by \",\")')
diff --git a/benchmarks/imaging_ecal/scripts/epi_separation.py b/benchmarks/imaging_ecal/scripts/epi_separation.py
index e552f21a..22936ad5 100644
--- a/benchmarks/imaging_ecal/scripts/epi_separation.py
+++ b/benchmarks/imaging_ecal/scripts/epi_separation.py
@@ -42,7 +42,7 @@ if __name__ == '__main__':
parser.add_argument('pifile', type=str, help='path to root file (pions)')
parser.add_argument('--prof', type=str, default='profile.csv', help='path to electron profile')
parser.add_argument('--plot-dir', type=str, default='./plots', dest='outdir', help='output directory')
- parser.add_argument('-b', '--branch-name', type=str, default='EcalBarrelClustersLayers', dest='branch',
+ parser.add_argument('-b', '--branch-name', type=str, default='EcalBarrelImagingClustersLayers', dest='branch',
help='branch name in the root file (outputLayerCollection from ImagingClusterReco)')
parser.add_argument('-m', '--macros', type=str, default='rootlogon.C', dest='macros',
help='root macros to load (accept multiple paths separated by \",\")')
diff --git a/benchmarks/imaging_ecal/scripts/utils.py b/benchmarks/imaging_ecal/scripts/utils.py
index 19f3722d..51f48c4a 100644
--- a/benchmarks/imaging_ecal/scripts/utils.py
+++ b/benchmarks/imaging_ecal/scripts/utils.py
@@ -110,7 +110,7 @@ def get_all_mcp(path, evnums=None, branch='mcparticles2'):
return pd.DataFrame(data=dbuf[:idb], columns=['event', 'px', 'py', 'pz', 'pid', 'status', 'g4Parent', 'vex', 'vey', 'vez'])
# read hits data from root file
-def get_hits_data(path, evnums=None, branch='RecoEcalBarrelHits'):
+def get_hits_data(path, evnums=None, branch='RecoEcalBarreImaginglHits'):
f = ROOT.TFile(path)
events = f.events
if evnums is None:
@@ -136,7 +136,7 @@ def get_hits_data(path, evnums=None, branch='RecoEcalBarrelHits'):
# read layers data from root file
-def get_layers_data(path, evnums=None, branch="EcalBarrelClustersLayers"):
+def get_layers_data(path, evnums=None, branch="EcalBarrelImagingClustersLayers"):
f = ROOT.TFile(path)
events = f.events
if evnums is None:
@@ -163,7 +163,7 @@ def get_layers_data(path, evnums=None, branch="EcalBarrelClustersLayers"):
# read clusters data from root file
-def get_clusters_data(path, evnums=None, branch='EcalBarrelClustersReco'):
+def get_clusters_data(path, evnums=None, branch='EcalBarrelImagingClustersReco'):
f = ROOT.TFile(path)
events = f.events
if evnums is None:
--
GitLab