Merge pull request #33336 from lecriste/ticlIterationsAuto

[HGCAL] Update TICL iterations naming
cms-sw · Apr 9, 2021 · 0cc12c5 · 0cc12c5
2 parents 8d16e3e + 6a889d4
commit 0cc12c5
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 30 deletions.
diff --git a/RecoHGCal/TICL/plugins/TrackstersProducer.cc b/RecoHGCal/TICL/plugins/TrackstersProducer.cc
@@ -102,9 +102,9 @@ TrackstersProducer::TrackstersProducer(const edm::ParameterSet& ps, const Tracks
     iterIndex_ = ticl::Trackster::TRKEM;
   else if (itername_ == "EM")
     iterIndex_ = ticl::Trackster::EM;
-  else if (itername_ == "TRK")
+  else if (itername_ == "Trk")
     iterIndex_ = ticl::Trackster::TRKHAD;
-  else if (itername_ == "HADRONIC")
+  else if (itername_ == "HAD")
     iterIndex_ = ticl::Trackster::HAD;
   else if (itername_ == "MIP")
     iterIndex_ = ticl::Trackster::MIP;

diff --git a/RecoHGCal/TICL/python/HADStep_cff.py b/RecoHGCal/TICL/python/HADStep_cff.py
@@ -30,7 +30,7 @@
     min_cos_theta = 0.866,    # ~30 degrees
     min_cos_pointing = 0.819, # ~35 degrees
     max_delta_time = -1,
-    itername = "HADRONIC"
+    itername = "HAD"
     )
 
 # MULTICLUSTERS

diff --git a/RecoHGCal/TICL/python/TrkStep_cff.py b/RecoHGCal/TICL/python/TrkStep_cff.py
@@ -32,7 +32,7 @@
   algo_verbosity = 2,
   oneTracksterPerTrackSeed = True,
   promoteEmptyRegionToTrackster = True,
-  itername = "TRK"
+  itername = "Trk"
 )
 
 # MULTICLUSTERS

diff --git a/RecoHGCal/TICL/python/iterativeTICL_cff.py b/RecoHGCal/TICL/python/iterativeTICL_cff.py
@@ -22,14 +22,20 @@
 pfTICL = _pfTICLProducer.clone()
 ticlPFTask = cms.Task(pfTICL)
 
-iterTICLTask = cms.Task(ticlLayerTileTask
-    ,ticlTrkEMStepTask
+ticlIterationsTask = cms.Task(
+    ticlTrkEMStepTask
     ,ticlEMStepTask
     ,ticlTrkStepTask
     ,ticlHADStepTask
+)
+ticlIterLabels = [_step.itername.value() for _iteration in ticlIterationsTask for _step in _iteration if (_step._TypedParameterizable__type == "TrackstersProducer")]
+
+iterTICLTask = cms.Task(ticlLayerTileTask
+    ,ticlIterationsTask
     ,ticlTracksterMergeTask
     ,ticlPFTask
-    )
+)
+ticlIterLabelsMerge = ticlIterLabels + ["Merge"]
 
 ticlLayerTileHFNose = ticlLayerTileProducer.clone(
     detector = 'HFNose'

diff --git a/Validation/HGCalValidation/python/HGCalValidator_cfi.py b/Validation/HGCalValidation/python/HGCalValidator_cfi.py
@@ -7,6 +7,12 @@
 from SimCalorimetry.HGCalAssociatorProducers.LCToSCAssociation_cfi import layerClusterSimClusterAssociation
 
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+
+from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabels, ticlIterLabelsMerge
+
+labelMcl = [cms.InputTag("ticlMultiClustersFromTracksters"+iteration) for iteration in ticlIterLabelsMerge]
+lcInputMask = [cms.InputTag("ticlTracksters"+iteration) for iteration in ticlIterLabels]
+
 hgcalValidator = DQMEDAnalyzer(
     "HGCalValidator",
 
@@ -17,12 +23,7 @@
     ### reco input configuration ###
     #2dlayerclusters, pfclusters, multiclusters
     label_lcl = layerClusterCaloParticleAssociation.label_lc,
-    label_mcl = cms.VInputTag(
-      cms.InputTag("ticlMultiClustersFromTrackstersTrk"),
-      cms.InputTag("ticlMultiClustersFromTrackstersTrkEM"),
-      cms.InputTag("ticlMultiClustersFromTrackstersEM"),
-      cms.InputTag("ticlMultiClustersFromTrackstersHAD"),
-      cms.InputTag("ticlMultiClustersFromTrackstersMerge")),
+    label_mcl = cms.VInputTag(labelMcl),
 
     associator = cms.untracked.InputTag("layerClusterCaloParticleAssociationProducer"),
 
@@ -54,12 +55,7 @@
 
     simVertices = cms.InputTag("g4SimHits"),
 
-    LayerClustersInputMask = cms.VInputTag(
-        cms.InputTag("ticlTrackstersTrkEM"),
-        cms.InputTag("ticlTrackstersEM"),
-        cms.InputTag("ticlTrackstersTrk"),
-        cms.InputTag("ticlTrackstersHAD")
-    ),
+    LayerClustersInputMask = cms.VInputTag(lcInputMask),
 
     #Total number of layers of HGCal that we want to monitor
     #Could get this also from HGCalImagingAlgo::maxlayer but better to get it from here

diff --git a/Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py b/Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py
@@ -1,5 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
+from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabelsMerge
 
 maxlayerzm =  50# last layer of BH -z
 maxlayerzp =  100# last layer of BH +z
@@ -33,14 +34,9 @@
 eff_simclusters.extend(["merge_eta_layer{:02d} 'LayerCluster Merge Rate vs #eta Layer{:02d} in z-' NumMerge_LayerCluster_in_SimCluster_Eta_perlayer{:02d} Denom_LayerCluster_in_SimCluster_Eta_perlayer{:02d}".format(i, i%maxlayerzm+1, i, i) if (i<maxlayerzm) else "merge_eta_layer{:02d} 'LayerCluster Merge Rate vs #eta Layer{:02d} in z+' NumMerge_LayerCluster_in_SimCluster_Eta_perlayer{:02d} Denom_LayerCluster_in_SimCluster_Eta_perlayer{:02d}".format(i, i%maxlayerzm+1, i, i) for i in range(maxlayerzp) ])
 eff_simclusters.extend(["merge_phi_layer{:02d} 'LayerCluster Merge Rate vs #phi Layer{:02d} in z-' NumMerge_LayerCluster_in_SimCluster_Phi_perlayer{:02d} Denom_LayerCluster_in_SimCluster_Phi_perlayer{:02d}".format(i, i%maxlayerzm+1, i, i) if (i<maxlayerzm) else "merge_phi_layer{:02d} 'LayerCluster Merge Rate vs #phi Layer{:02d} in z+' NumMerge_LayerCluster_in_SimCluster_Phi_perlayer{:02d} Denom_LayerCluster_in_SimCluster_Phi_perlayer{:02d}".format(i, i%maxlayerzm+1, i, i) for i in range(maxlayerzp) ])
 
+subdirsSim = ['HGCAL/HGCalValidator/simClusters/ticlTracksters'+iteration+'/' for iteration in ticlIterLabelsMerge]
 postProcessorHGCALsimclusters= DQMEDHarvester('DQMGenericClient',
-    subDirs = cms.untracked.vstring(
-        'HGCAL/HGCalValidator/simClusters/ticlTrackstersTrkEM',
-        'HGCAL/HGCalValidator/simClusters/ticlTrackstersEM',
-        'HGCAL/HGCalValidator/simClusters/ticlTrackstersTrk',
-        'HGCAL/HGCalValidator/simClusters/ticlTrackstersHAD',
-        'HGCAL/HGCalValidator/simClusters/ticlTrackstersMerge'
-    ),
+    subDirs = cms.untracked.vstring(subdirsSim),
     efficiency = cms.vstring(eff_simclusters),
     resolution = cms.vstring(),
     cumulativeDists = cms.untracked.vstring(),
@@ -57,12 +53,11 @@
 eff_multiclusters.extend(["merge_eta 'MultiCluster Merge Rate vs #eta' NumMerge_MultiCluster_Eta Denom_MultiCluster_Eta"])
 eff_multiclusters.extend(["merge_phi 'MultiCluster Merge Rate vs #phi' NumMerge_MultiCluster_Phi Denom_MultiCluster_Phi"])
 
-subdirs = ['HGCAL/HGCalValidator/hgcalMultiClusters/']
-iterations = ['TrkEM','EM','Trk','HAD','Merge']
-subdirs.extend('HGCAL/HGCalValidator/ticlMultiClustersFromTracksters'+iteration+'/' for iteration in iterations)
+subdirsMult = ['HGCAL/HGCalValidator/hgcalMultiClusters/']
+subdirsMult.extend('HGCAL/HGCalValidator/ticlMultiClustersFromTracksters'+iteration+'/' for iteration in ticlIterLabelsMerge)
 
 postProcessorHGCALmulticlusters = DQMEDHarvester('DQMGenericClient',
-  subDirs = cms.untracked.vstring(subdirs),
+  subDirs = cms.untracked.vstring(subdirsMult),
   efficiency = cms.vstring(eff_multiclusters),
   resolution = cms.vstring(),
   cumulativeDists = cms.untracked.vstring(),