Draft: Resolve "HCal clustering benchmark"

Closes #31

benchmarks/clustering/options/fullcalo_clustering.py

@@ -29,15 +29,18 @@ 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__HadronicCalDigi as HadCalorimeterDigi
+# from Configurables import Jug__Digi__HadronicCalDigi as HadCalorimeterDigi
+from Configurables import Jug__Digi__CalorimeterHitDigi as HadCalorimeterDigi
 from Configurables import Jug__Digi__EMCalorimeterDigi as EMCalorimeterDigi
 from Configurables import Jug__Digi__CrystalEndcapsDigi as CrystalEndcapsDigi
 
 from Configurables import Jug__Reco__CrystalEndcapsReco as CrystalEndcapsReco
 from Configurables import Jug__Reco__EMCalReconstruction as EMCalReconstruction
-from Configurables import Jug__Reco__HCalReconstruction as HCalReconstruction
+# from Configurables import Jug__Reco__HCalReconstruction as HCalReconstruction
+from Configurables import Jug__Reco__EcalTungstenSamplingReco as HCalReconstruction
 
-from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
+# from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
+from Configurables import Jug__Reco__TopologicalCellCluster as TopoCluster
 from Configurables import Jug__Reco__CalorimeterIslandCluster as IslandCluster
 from Configurables import Jug__Reco__ClusterRecoCoG as RecoCoG
 
@@ -62,7 +65,15 @@ ecdigi = EMCalorimeterDigi("ec_barrel_digi",
 
 hcaldigi = HadCalorimeterDigi("hcal_barrel_digi",
          inputHitCollection="HcalBarrelHits",
-         outputHitCollection="RawHcalBarrelHits")
+         outputHitCollection="RawHcalBarrelHits",
+         inputEnergyUnit=units.GeV,
+         inputTimeUnit=units.ns,
+         energyResolutions=[0.07, 0., 0.],
+         dynamicRangeADC=2.*units.GeV,
+         capacityADC=32768,
+         pedestalMean=400,
+         pedestalSigma=10,
+         )
 
 
 
@@ -81,8 +92,11 @@ ecal_reco = EMCalReconstruction("ecal_reco",
 hcal_reco = HCalReconstruction("hcal_reco",
         inputHitCollection="RawHcalBarrelHits",
         outputHitCollection="RecHcalBarrelHits",
-        samplingFraction=0.25,
-        minModuleEdep=0.0*units.MeV)
+        dynamicRangeADC=2.*units.GeV,
+        capacityADC=32768,
+        pedestalMean=400,
+        pedestalSigma=10,
+        thresholdFactor=5.0)
 #clusters
 ec_barrel_cluster = IslandCluster("ec_barrel_cluster", 
         inputHitCollection="RecEcalBarrelHits", 
@@ -99,10 +113,22 @@ crystal_ec_cluster = IslandCluster("crystal_ec_cluster",
         groupRange=2.0,
         OutputLevel=DEBUG)
 
-simple_cluster = SimpleClustering("simple_cluster", 
-        inputHitCollection="RecEcalBarrelHits", 
-        outputClusters="SimpleClusters",
-        OutputLevel=DEBUG)
+# simple_cluster = SimpleClustering("simple_cluster", 
+#         inputHitCollection="RecEcalBarrelHits", 
+#         outputClusters="SimpleClusters",
+#         OutputLevel=DEBUG)
+
+hcal_barrel_cluster = TopoCluster("hcal_barrel_cluster",
+        inputHitCollection="RecHcalBarrelHits",
+        outputClusterCollection="HcalBarrelClusters",
+        adjLayerDiff=2,
+        localRanges=[20.*units.mm, 20.*units.mm],    # local x, y for hits at the same layer
+        adjLayerRanges=[0.02, 0.02],                 # eta, phi for different layers, the same sector
+        adjSectorDist=5.*units.cm,                   # different sector
+        minClusterCenterEdep=10.*units.MeV,
+        readoutClass="HcalBarrelHits",               # readout class name to get layer/sector id
+        layerField="layer",
+        sectorField="module")
 
 # finalizing clustering (center-of-gravity step)
 ec_barrel_clusterreco = RecoCoG("ec_barrel_clusterreco",
@@ -117,6 +143,11 @@ clusterreco = RecoCoG("cluster_reco",
         samplingFraction=sf, 
         OutputLevel=DEBUG)
 
+hcal_barrel_clusterreco = RecoCoG("hcal_barrel_clusterreco",
+        clusterCollection="HcalBarrelClusters", 
+        logWeightBase=6.2,
+        samplingFraction=sf) 
+
 out = PodioOutput("out", filename=output_rec_file)
 
 out.outputCommands = ["keep *"]
@@ -125,6 +156,7 @@ ApplicationMgr(
     TopAlg = [podioinput, copier, calcopier,
               ecdigi, emcaldigi,hcaldigi,
               crystal_ec_reco, ecal_reco, hcal_reco,  
+              hcal_barrel_cluster, hcal_barrel_clusterreco,
               #ec_barrel_cluster, crystal_ec_cluster, ec_barrel_clusterreco, clusterreco,
               #simple_cluster,
               out],