Resolve "Remove obsolete algorithms from full simulations"

Closes #51 (closed)

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