From dab901f0080e595042464c5788085e24e2116fa0 Mon Sep 17 00:00:00 2001 From: Leonardo Cristella Date: Mon, 5 Apr 2021 15:12:23 +0200 Subject: [PATCH 1/6] Create iterations list --- RecoHGCal/TICL/python/iterativeTICL_cff.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/RecoHGCal/TICL/python/iterativeTICL_cff.py b/RecoHGCal/TICL/python/iterativeTICL_cff.py index 9c961d580d09e..50e555e00975c 100644 --- a/RecoHGCal/TICL/python/iterativeTICL_cff.py +++ b/RecoHGCal/TICL/python/iterativeTICL_cff.py @@ -22,14 +22,19 @@ pfTICL = _pfTICLProducer.clone() ticlPFTask = cms.Task(pfTICL) -iterTICLTask = cms.Task(ticlLayerTileTask - ,ticlTrkEMStepTask +ticlIterations = cms.Task( + ticlTrkEMStepTask ,ticlEMStepTask ,ticlTrkStepTask ,ticlHADStepTask +) +ticlIterLables = [_step.itername for _iteration in ticlIterations for _step in _iteration if (_step._TypedParameterizable__type == "TrackstersProducer")] + +iterTICLTask = cms.Task(ticlLayerTileTask + ,ticlIterations ,ticlTracksterMergeTask ,ticlPFTask - ) +) ticlLayerTileHFNose = ticlLayerTileProducer.clone( detector = 'HFNose' From e1bc136eec55139afcab7cbe8939a61848ae2148 Mon Sep 17 00:00:00 2001 From: Leonardo Cristella Date: Mon, 5 Apr 2021 21:59:05 +0200 Subject: [PATCH 2/6] Update itername to new naming --- RecoHGCal/TICL/python/HADStep_cff.py | 2 +- RecoHGCal/TICL/python/TrkStep_cff.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RecoHGCal/TICL/python/HADStep_cff.py b/RecoHGCal/TICL/python/HADStep_cff.py index 9af07d2e4faf4..655fadae45f3a 100644 --- 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 index 739a7cafd5d2b..32103badd3604 100644 --- 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 = "TrkHAD" ) # MULTICLUSTERS From 8e9cd50ab7a383f4ae9cea19548c839e9b5ea0a8 Mon Sep 17 00:00:00 2001 From: Leonardo Cristella Date: Mon, 5 Apr 2021 22:00:26 +0200 Subject: [PATCH 3/6] Remove duplicate hard-code labels --- RecoHGCal/TICL/python/iterativeTICL_cff.py | 3 +- .../python/HGCalValidator_cfi.py | 19 +++++----- .../python/PostProcessorHGCAL_cfi.py | 35 ++++++++----------- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/RecoHGCal/TICL/python/iterativeTICL_cff.py b/RecoHGCal/TICL/python/iterativeTICL_cff.py index 50e555e00975c..10af6c9fc2293 100644 --- a/RecoHGCal/TICL/python/iterativeTICL_cff.py +++ b/RecoHGCal/TICL/python/iterativeTICL_cff.py @@ -28,13 +28,14 @@ ,ticlTrkStepTask ,ticlHADStepTask ) -ticlIterLables = [_step.itername for _iteration in ticlIterations for _step in _iteration if (_step._TypedParameterizable__type == "TrackstersProducer")] +ticlIterLabels = [_step.itername.value() for _iteration in ticlIterations for _step in _iteration if (_step._TypedParameterizable__type == "TrackstersProducer")] iterTICLTask = cms.Task(ticlLayerTileTask ,ticlIterations ,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 index db07bc9da6be0..55a0a40f53c1e 100644 --- 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,11 +23,7 @@ ### reco input configuration ### #2dlayerclusters, pfclusters, multiclusters label_lcl = layerClusterCaloParticleAssociation.label_lc, - label_mcl = cms.VInputTag( - cms.InputTag("ticlMultiClustersFromTrackstersTrk"), - cms.InputTag("ticlMultiClustersFromTrackstersEM"), - cms.InputTag("ticlMultiClustersFromTrackstersHAD"), - cms.InputTag("ticlMultiClustersFromTrackstersMerge")), + label_mcl = cms.VInputTag(labelMcl), associator = cms.untracked.InputTag("layerClusterCaloParticleAssociationProducer"), @@ -53,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 index 5c9d8b47c919b..7d5d07a6c07f2 100644 --- 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 Date: Tue, 6 Apr 2021 13:28:11 +0200 Subject: [PATCH 4/6] Uniform python label --- RecoHGCal/TICL/python/iterativeTICL_cff.py | 6 +++--- Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RecoHGCal/TICL/python/iterativeTICL_cff.py b/RecoHGCal/TICL/python/iterativeTICL_cff.py index 10af6c9fc2293..3fdf588e188a5 100644 --- a/RecoHGCal/TICL/python/iterativeTICL_cff.py +++ b/RecoHGCal/TICL/python/iterativeTICL_cff.py @@ -22,16 +22,16 @@ pfTICL = _pfTICLProducer.clone() ticlPFTask = cms.Task(pfTICL) -ticlIterations = cms.Task( +ticlIterationsTask = cms.Task( ticlTrkEMStepTask ,ticlEMStepTask ,ticlTrkStepTask ,ticlHADStepTask ) -ticlIterLabels = [_step.itername.value() for _iteration in ticlIterations for _step in _iteration if (_step._TypedParameterizable__type == "TrackstersProducer")] +ticlIterLabels = [_step.itername.value() for _iteration in ticlIterationsTask for _step in _iteration if (_step._TypedParameterizable__type == "TrackstersProducer")] iterTICLTask = cms.Task(ticlLayerTileTask - ,ticlIterations + ,ticlIterationsTask ,ticlTracksterMergeTask ,ticlPFTask ) diff --git a/Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py b/Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py index 7d5d07a6c07f2..ed181b75c5a5a 100644 --- a/Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py +++ b/Validation/HGCalValidation/python/PostProcessorHGCAL_cfi.py @@ -34,7 +34,7 @@ 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 Date: Tue, 6 Apr 2021 13:58:17 +0200 Subject: [PATCH 5/6] Propagate new iteration label --- RecoHGCal/TICL/python/TrkStep_cff.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RecoHGCal/TICL/python/TrkStep_cff.py b/RecoHGCal/TICL/python/TrkStep_cff.py index 32103badd3604..d89d574a512c9 100644 --- a/RecoHGCal/TICL/python/TrkStep_cff.py +++ b/RecoHGCal/TICL/python/TrkStep_cff.py @@ -18,7 +18,7 @@ # CA - PATTERN RECOGNITION -ticlTrackstersTrk = _trackstersProducer.clone( +ticlTrackstersTrkHAD = _trackstersProducer.clone( filtered_mask = "filteredLayerClustersTrk:Trk", seeding_regions = "ticlSeedingTrk", original_mask = 'ticlTrackstersEM', @@ -37,13 +37,13 @@ # MULTICLUSTERS -ticlMultiClustersFromTrackstersTrk = _multiClustersFromTrackstersProducer.clone( - Tracksters = "ticlTrackstersTrk" +ticlMultiClustersFromTrackstersTrkHAD = _multiClustersFromTrackstersProducer.clone( + Tracksters = "ticlTrackstersTrkHAD" ) ticlTrkStepTask = cms.Task(ticlSeedingTrk ,filteredLayerClustersTrk - ,ticlTrackstersTrk - ,ticlMultiClustersFromTrackstersTrk) + ,ticlTrackstersTrkHAD + ,ticlMultiClustersFromTrackstersTrkHAD) From 6a889d4df7f740cbbd3d2ea63b8f807752d610bd Mon Sep 17 00:00:00 2001 From: Leonardo Cristella Date: Tue, 6 Apr 2021 14:15:16 +0200 Subject: [PATCH 6/6] Restore TrkHAD -> Trk --- RecoHGCal/TICL/plugins/TrackstersProducer.cc | 2 +- RecoHGCal/TICL/python/TrkStep_cff.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/RecoHGCal/TICL/plugins/TrackstersProducer.cc b/RecoHGCal/TICL/plugins/TrackstersProducer.cc index 085955d0d649b..a24cc86f49aca 100644 --- a/RecoHGCal/TICL/plugins/TrackstersProducer.cc +++ b/RecoHGCal/TICL/plugins/TrackstersProducer.cc @@ -102,7 +102,7 @@ TrackstersProducer::TrackstersProducer(const edm::ParameterSet& ps, const Tracks iterIndex_ = ticl::Trackster::TRKEM; else if (itername_ == "EM") iterIndex_ = ticl::Trackster::EM; - else if (itername_ == "TrkHAD") + else if (itername_ == "Trk") iterIndex_ = ticl::Trackster::TRKHAD; else if (itername_ == "HAD") iterIndex_ = ticl::Trackster::HAD; diff --git a/RecoHGCal/TICL/python/TrkStep_cff.py b/RecoHGCal/TICL/python/TrkStep_cff.py index d89d574a512c9..2529264542862 100644 --- a/RecoHGCal/TICL/python/TrkStep_cff.py +++ b/RecoHGCal/TICL/python/TrkStep_cff.py @@ -18,7 +18,7 @@ # CA - PATTERN RECOGNITION -ticlTrackstersTrkHAD = _trackstersProducer.clone( +ticlTrackstersTrk = _trackstersProducer.clone( filtered_mask = "filteredLayerClustersTrk:Trk", seeding_regions = "ticlSeedingTrk", original_mask = 'ticlTrackstersEM', @@ -32,18 +32,18 @@ algo_verbosity = 2, oneTracksterPerTrackSeed = True, promoteEmptyRegionToTrackster = True, - itername = "TrkHAD" + itername = "Trk" ) # MULTICLUSTERS -ticlMultiClustersFromTrackstersTrkHAD = _multiClustersFromTrackstersProducer.clone( - Tracksters = "ticlTrackstersTrkHAD" +ticlMultiClustersFromTrackstersTrk = _multiClustersFromTrackstersProducer.clone( + Tracksters = "ticlTrackstersTrk" ) ticlTrkStepTask = cms.Task(ticlSeedingTrk ,filteredLayerClustersTrk - ,ticlTrackstersTrkHAD - ,ticlMultiClustersFromTrackstersTrkHAD) + ,ticlTrackstersTrk + ,ticlMultiClustersFromTrackstersTrk)