adjust imaging ecal benchmarks according to juggler update

benchmarks/imaging_ecal/options/imaging_topocluster.py

@@ -9,10 +9,10 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from Configurables import PodioInput
 from Configurables import Jug__Base__InputCopier_dd4pod__Geant4ParticleCollection_dd4pod__Geant4ParticleCollection_ as MCCopier
 from Configurables import Jug__Base__InputCopier_dd4pod__CalorimeterHitCollection_dd4pod__CalorimeterHitCollection_ as CalCopier
-from Configurables import Jug__Digi__EcalTungstenSamplingDigi as EcalTungstenSamplingDigi
-from Configurables import Jug__Reco__EcalTungstenSamplingReco as EcalTungstenSamplingReco
-from Configurables import Jug__Reco__TopologicalCellCluster as TopologicalCellCluster
-from Configurables import Jug__Reco__ImagingClusterReco as ImagingReco
+from Configurables import Jug__Digi__CalorimeterHitDigi as CalorimeterHitDigi
+from Configurables import Jug__Reco__ImagingPixelReco as ImagingPixelReco
+from Configurables import Jug__Reco__ImagingTopoCluster as ImagingTopoCluster
+from Configurables import Jug__Reco__ImagingClusterReco as ImagingClusterReco
 
 
 # input arguments through environment variables
@@ -27,6 +27,8 @@ if kwargs['nev'] < 1:
     f = ROOT.TFile(kwargs['input'])
     kwargs['nev'] = f.events.GetEntries()
 
+print(kwargs)
+
 # get sampling fraction from system environment variable, 1.0 by default
 sf = float(os.environ.get('CB_EMCAL_SAMP_FRAC', '1.0'))
 
@@ -45,41 +47,38 @@ calcopier = CalCopier("CalCopier",
                       outputCollection="EcalBarrelHits2",
                       OutputLevel=DEBUG)
 
-emcaldigi = EcalTungstenSamplingDigi("ecal_digi",
-                                     inputHitCollection="EcalBarrelHits",
-                                     outputHitCollection="DigiEcalBarrelHits",
-                                     inputEnergyUnit=units.GeV,
-                                     inputTimeUnit=units.ns,
-                                     energyResolutions=[0., 0.02, 0.],
-                                     dynamicRangeADC=3*units.MeV,
-                                     pedestalSigma=40,
-                                     OutputLevel=DEBUG)
-emcalreco = EcalTungstenSamplingReco("ecal_reco",
-                                     inputHitCollection="DigiEcalBarrelHits",
-                                     outputHitCollection="RecoEcalBarrelHits",
-                                     dynamicRangeADC=3.*units.MeV,
-                                     pedestalSigma=40,
-                                     OutputLevel=DEBUG)
-emcalcluster = TopologicalCellCluster(inputHitCollection="RecoEcalBarrelHits",
-                                      outputClusterCollection="EcalBarrelClusters",
-                                      minClusterCenterEdep=0.3*units.MeV,
-                                      localRanges=[2.*units.mm, 2*units.mm],
-                                      adjLayerRanges=[5*units.mrad, 5*units.mrad],
-                                      adjLayerDiff=1,
-                                      adjSectorDist=1*units.cm,
-                                      layerField="layer",
-                                      sectorField="module")
-clusterreco = ImagingReco(inputClusterCollection="EcalBarrelClusters",
-                          outputClusterCollection="EcalBarrelClustersReco",
-                          outputLayerCollection="EcalBarrelClustersLayers",
-                          samplingFraction=sf,
-                          layerIDMaskRange=[15, 24],
-                          OutputLevel=DEBUG)
+imcaldigi = CalorimeterHitDigi("imcal_digi",
+                               inputHitCollection="EcalBarrelHits",
+                               outputHitCollection="DigiEcalBarrelHits",
+                               inputEnergyUnit=units.GeV,
+                               inputTimeUnit=units.ns,
+                               energyResolutions=[0., 0.02, 0.],
+                               dynamicRangeADC=3*units.MeV,
+                               pedestalSigma=40,
+                               OutputLevel=DEBUG)
+imcalreco = ImagingPixelReco("imcal_reco",
+                             inputHitCollection="DigiEcalBarrelHits",
+                             outputHitCollection="RecoEcalBarrelHits",
+                             dynamicRangeADC=3.*units.MeV,
+                             pedestalSigma=40,
+                             readoutClass="EcalBarrelHits",
+                             layerField="layer",
+                             sectorField="module")
+imcalcluster = ImagingTopoCluster(inputHitCollection="RecoEcalBarrelHits",
+                                  outputClusterCollection="EcalBarrelClusters",
+                                  localRanges=[2.*units.mm, 2*units.mm],
+                                  adjLayerRanges=[10*units.mrad, 10*units.mrad],
+                                  adjLayerDiff=2,
+                                  adjSectorDist=3.*units.cm)
+clusterreco = ImagingClusterReco(inputClusterCollection="EcalBarrelClusters",
+                                 outputLayerCollection="EcalBarrelClustersLayers",
+                                 samplingFraction=sf,
+                                 OutputLevel=DEBUG)
 
 out.outputCommands = ["keep *"]
 
 ApplicationMgr(
-    TopAlg=[podioinput, copier, calcopier, emcaldigi, emcalreco, emcalcluster, clusterreco, out],
+    TopAlg=[podioinput, copier, calcopier, imcaldigi, imcalreco, imcalcluster, clusterreco, out],
     EvtSel='NONE',
     EvtMax=kwargs['nev'],
     ExtSvc=[podioevent],