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}")

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

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',

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', '')),

benchmarks/full/full_reconstruction.sh

@@ -164,13 +164,14 @@ OPTION_DIR=benchmarks/full/options
 SCRIPT_DIR=benchmarks/full/scripts
 
 # Run Juggler
-xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-    gaudirun.py ${OPTION_DIR}/full_reconstruction.py
+gaudirun.py ${OPTION_DIR}/full_reconstruction.py
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running reconstruction (juggler)"
   exit 1
 fi
 
+rootls -t "${JUGGLER_REC_FILE}"
+
 # Run analysis scripts
 #python ${SCRIPT_DIR}/full_reconstruction.py ${JUGGLER_SIM_FILE} ${JUGGLER_REC_FILE} -o results
 

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
@@ -152,13 +152,13 @@ ce_ecal_daq = dict(
 
 ce_ecal_digi = CalHitDigi("ce_ecal_digi",
         inputHitCollection="EcalEndcapNHits",
-        outputHitCollection="EcalEndcapNHitsDigi",
+        outputHitCollection="EcalEndcapNRawHits",
         energyResolutions=[0., 0.02, 0.],
         **ce_ecal_daq)
 
 ce_ecal_reco = CalHitReco("ce_ecal_reco",
         inputHitCollection=ce_ecal_digi.outputHitCollection,
-        outputHitCollection="EcalEndcapNHitsReco",
+        outputHitCollection="EcalEndcapNRecHits",
         thresholdFactor=4,          # 4 sigma cut on pedestal sigma
         readoutClass="EcalEndcapNHits",
         sectorField="sector",
@@ -189,19 +189,19 @@ ci_ecal_daq = dict(
 
 ci_ecal_digi = CalHitDigi("ci_ecal_digi",
         inputHitCollection="EcalEndcapPHits",
-        outputHitCollection="EcalEndcapPHitsDigi",
+        outputHitCollection="EcalEndcapPRawHits",
         **ci_ecal_daq)
 
 ci_ecal_reco = CalHitReco("ci_ecal_reco",
         inputHitCollection=ci_ecal_digi.outputHitCollection,
-        outputHitCollection="EcalEndcapPHitsReco",
+        outputHitCollection="EcalEndcapPRecHits",
         thresholdFactor=5.0,
         **ci_ecal_daq)
 
 # merge hits in different layer (projection to local x-y plane)
 ci_ecal_merger = CalHitsMerger("ci_ecal_merger",
         inputHitCollection=ci_ecal_reco.outputHitCollection,
-        outputHitCollection="EcalEndcapPHitsRecoXY",
+        outputHitCollection="EcalEndcapPRecHitsXY",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0],
         readoutClass="EcalEndcapPHits")
@@ -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="EcalBarrelImagingRawHits",
         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="EcalBarrelImagingRecHits",
         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(
@@ -268,12 +268,12 @@ scfi_barrel_daq = dict(
 
 scfi_barrel_digi = CalHitDigi("scfi_barrel_digi",
         inputHitCollection="EcalBarrelScFiHits",
-        outputHitCollection="EcalBarrelScFiHitsDigi",
+        outputHitCollection="EcalBarrelScFiRawHits",
         **scfi_barrel_daq)
 
 scfi_barrel_reco = CalHitReco("scfi_barrel_reco",
         inputHitCollection=scfi_barrel_digi.outputHitCollection,
-        outputHitCollection="EcalBarrelScFiHitsReco",
+        outputHitCollection="EcalBarrelScFiRecHits",
         thresholdFactor=5.0,
         readoutClass="EcalBarrelScFiHits",
         layerField="layer",
@@ -313,12 +313,12 @@ cb_hcal_daq = dict(
 
 cb_hcal_digi = CalHitDigi("cb_hcal_digi",
          inputHitCollection="HcalBarrelHits",
-         outputHitCollection="HcalBarrelHitsDigi",
+         outputHitCollection="HcalBarrelRawHits",
          **cb_hcal_daq)
 
 cb_hcal_reco = CalHitReco("cb_hcal_reco",
         inputHitCollection=cb_hcal_digi.outputHitCollection,
-        outputHitCollection="HcalBarrelHitsReco",
+        outputHitCollection="HcalBarrelRecHits",
         thresholdFactor=5.0,
         readoutClass="HcalBarrelHits",
         layerField="layer",
@@ -327,7 +327,7 @@ cb_hcal_reco = CalHitReco("cb_hcal_reco",
 
 cb_hcal_merger = CalHitsMerger("cb_hcal_merger",
         inputHitCollection=cb_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalBarrelHitsRecoXY",
+        outputHitCollection="HcalBarrelRecHitsXY",
         readoutClass="HcalBarrelHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -356,18 +356,18 @@ ci_hcal_daq = dict(
          pedestalSigma=10)
 ci_hcal_digi = CalHitDigi("ci_hcal_digi",
          inputHitCollection="HcalEndcapPHits",
-         outputHitCollection="HcalEndcapPHitsDigi",
+         outputHitCollection="HcalEndcapPRawHits",
          **ci_hcal_daq)
 
 ci_hcal_reco = CalHitReco("ci_hcal_reco",
         inputHitCollection=ci_hcal_digi.outputHitCollection,
-        outputHitCollection="HcalEndcapPHitsReco",
+        outputHitCollection="HcalEndcapPRecHits",
         thresholdFactor=5.0,
         **ci_hcal_daq)
 
 ci_hcal_merger = CalHitsMerger("ci_hcal_merger",
         inputHitCollection=ci_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalEndcapPHitsRecoXY",
+        outputHitCollection="HcalEndcapPRecHitsXY",
         readoutClass="HcalEndcapPHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -396,18 +396,18 @@ ce_hcal_daq = dict(
 
 ce_hcal_digi = CalHitDigi("ce_hcal_digi",
         inputHitCollection="HcalEndcapNHits",
-        outputHitCollection="HcalEndcapNHitsDigi",
+        outputHitCollection="HcalEndcapNRawHits",
         **ce_hcal_daq)
 
 ce_hcal_reco = CalHitReco("ce_hcal_reco",
         inputHitCollection=ce_hcal_digi.outputHitCollection,
-        outputHitCollection="HcalEndcapNHitsReco",
+        outputHitCollection="HcalEndcapNRecHits",
         thresholdFactor=5.0,
         **ce_hcal_daq)
 
 ce_hcal_merger = CalHitsMerger("ce_hcal_merger",
         inputHitCollection=ce_hcal_reco.outputHitCollection,
-        outputHitCollection="HcalEndcapNHitsRecoXY",
+        outputHitCollection="HcalEndcapNRecHitsXY",
         readoutClass="HcalEndcapNHits",
         fields=["layer", "slice"],
         fieldRefNumbers=[1, 0])
@@ -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)
 
@@ -539,24 +539,22 @@ parts_from_fit = ParticlesFromTrackFit("parts_from_fit",
 
 pmtdigi = PhotoMultiplierDigi("pmtdigi",
         inputHitCollection="DRICHHits",
-        outputHitCollection="DRICHHitsDigi",
+        outputHitCollection="DRICHRawHits",
         quantumEfficiency=[(a*units.eV, b) for a, b in qe_data])
 
 pmtreco = PhotoMultiplierReco("pmtreco",
-        inputHitCollection="DRICHHitsDigi",
-        outputHitCollection="DRICHHitsReco")
+        inputHitCollection=pmtdigi.outputHitCollection,
+        outputHitCollection="DRICHRecHits")
 
 # FIXME
 #richcluster = PhotoRingClusters("richcluster",
-#        inputHitCollection="ForwardRICHHitsReco",
+#        inputHitCollection=pmtreco.outputHitCollection,
 #        #inputTrackCollection="ReconstructedParticles",
 #        outputClusterCollection="ForwardRICHClusters")
 
 # Output
 podout.outputCommands = ["keep *",
-        "keep *Digi",
-        "keep *Reco*",
-        "keep *ClusterHits",
+        "keep *Hits",
         "keep *Clusters",
         "keep *Layers",
         "drop mcparticles"
@@ -568,7 +566,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,

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

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'])
 

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 *"]

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

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

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)')

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)')

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 \",\")')

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 \",\")')

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: