From ec3e0773b95ee002876125a9cc0045961761ba3a Mon Sep 17 00:00:00 2001 From: Chao Peng <cpeng@anl.gov> Date: Tue, 8 Jun 2021 18:11:12 -0500 Subject: [PATCH] adjust emcal barrel clustering according to algorithm update --- benchmarks/ecal/options/emcal_barrel_reco.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/benchmarks/ecal/options/emcal_barrel_reco.py b/benchmarks/ecal/options/emcal_barrel_reco.py index a5354e3d..f69466b5 100644 --- a/benchmarks/ecal/options/emcal_barrel_reco.py +++ b/benchmarks/ecal/options/emcal_barrel_reco.py @@ -48,7 +48,7 @@ from Configurables import Jug__Base__InputCopier_dd4pod__CalorimeterHitCollectio from Configurables import Jug__Digi__EcalTungstenSamplingDigi as EcalTungstenSamplingDigi from Configurables import Jug__Reco__EcalTungstenSamplingReco as EcalTungstenSamplingReco -from Configurables import Jug__Reco__SamplingECalHitsMerger as SamplingECalHitsMerger +from Configurables import Jug__Reco__CalorimeterHitsMerger as CalorimeterHitsMerger from Configurables import Jug__Reco__CalorimeterIslandCluster as IslandCluster from Configurables import Jug__Reco__ClusterRecoCoG as RecoCoG @@ -85,13 +85,13 @@ embarrelreco = EcalTungstenSamplingReco("ecal_barrel_reco", # readout id definition for barrel ecal # <id>system:8,barrel:3,module:4,layer:10,slice:5,x:32:-16,y:-16</id> # xy_merger sum layers/slices, masking (8+3+4, 8+3+4+5+10-1) -embarrelxymerger = SamplingECalHitsMerger("ecal_barrel_xy_merger", - cellIDMaskRanges=[(15, 29)], +embarrelxymerger = CalorimeterHitsMerger("ecal_barrel_xy_merger", + cellIDMaskRanges=["layer", "slice"], inputHitCollection="RecoEcalBarrelHits", outputHitCollection="RecoEcalBarrelHitsXY") # xy_merger sum modules, masking (8+3+4+5+10, 8+3+4+5+10+32-1) -embarrelzmerger = SamplingECalHitsMerger("ecal_barrel_z_merger", - cellIDMaskRanges=[(30, 61)], +embarrelzmerger = CalorimeterHitsMerger("ecal_barrel_z_merger", + cellIDMaskRanges=["x", "y"], inputHitCollection="RecoEcalBarrelHits", outputHitCollection="RecoEcalBarrelHitsZ") # Clustering -- GitLab