[HGCAL] Deprecate MultiCluster

Configuration/EventContent/python/EventContent_cff.py

@@ -278,8 +278,6 @@ def SwapKeepAndDrop(l):
 
 ctpps.toModify(AODEventContent, 
     outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands)
-phase2_hgcal.toModify(AODEventContent,
-    outputCommands = AODEventContent.outputCommands + TICL_AOD.outputCommands)
 #
 #
 # RAWAOD Data Tier definition

RecoHGCal/Configuration/python/RecoHGCal_EventContent_cff.py

@@ -1,38 +1,18 @@
 import FWCore.ParameterSet.Config as cms
 
+from RecoHGCal.TICL.iterativeTICL_cff import ticlIterLabelsMerge
 
-#AOD content
-TICL_AOD = cms.PSet(
-  # 13/04/2021 Felice: MultiClusters will be deprecated soon
-    outputCommands = cms.untracked.vstring(
-      'keep *_ticlMultiClustersFromTrackstersEM_*_*',
-      'keep *_ticlMultiClustersFromTrackstersHAD_*_*',
-      'keep *_ticlMultiClustersFromTrackstersTrk_*_*',
-      'keep *_ticlMultiClustersFromTrackstersTrkEM_*_*',
-      'keep *_ticlMultiClustersFromTrackstersMIP_*_*',
-      'keep *_ticlMultiClustersFromTrackstersMerge_*_*',
-      'keep *_ticlMultiClustersFromSimTracksters_*_*',
-      )
-    )
+trackstersIters = ['keep *_ticlTracksters'+iteration+'_*_*' for iteration in ticlIterLabelsMerge]
+trackstersHFNoseIters = ['keep *_ticlTrackstersHFNose'+iteration+'_*_*' for iteration in ticlIterLabelsMerge]
 
 #RECO content
 TICL_RECO = cms.PSet(
     outputCommands = cms.untracked.vstring(
-      'keep *_ticlTrackstersTrkEM_*_*',
-      'keep *_ticlTrackstersEM_*_*',
-      'keep *_ticlTrackstersHAD_*_*',
-      'keep *_ticlTrackstersTrk_*_*',
-      'keep *_ticlTrackstersMIP_*_*',
-      'keep *_ticlTrackstersMerge_*_*',
-      'keep *_ticlTrackstersHFNoseTrkEM_*_*',
-      'keep *_ticlTrackstersHFNoseEM_*_*',
-      'keep *_ticlTrackstersHFNoseMIP_*_*',
-      'keep *_ticlTrackstersHFNoseHAD_*_*',
-      'keep *_ticlTrackstersHFNoseMerge_*_*',
-      'keep *_pfTICL_*_*'
+      trackstersIters +
+      trackstersHFNoseIters +
+      ['keep *_pfTICL_*_*']
       )
     )
-TICL_RECO.outputCommands.extend(TICL_AOD.outputCommands)
 
 # FEVT Content
 TICL_FEVT = cms.PSet(
@@ -41,4 +21,3 @@
       )
     )
 TICL_FEVT.outputCommands.extend(TICL_RECO.outputCommands)
-

RecoHGCal/TICL/python/EMStep_cff.py

@@ -3,7 +3,6 @@
 from RecoHGCal.TICL.TICLSeedingRegions_cff import ticlSeedingGlobal, ticlSeedingGlobalHFNose
 from RecoHGCal.TICL.trackstersProducer_cfi import trackstersProducer as _trackstersProducer
 from RecoHGCal.TICL.filteredLayerClustersProducer_cfi import filteredLayerClustersProducer as _filteredLayerClustersProducer
-from RecoHGCal.TICL.multiClustersFromTrackstersProducer_cfi import multiClustersFromTrackstersProducer as _multiClustersFromTrackstersProducer
 
 # CLUSTER FILTERING/MASKING
 
@@ -38,16 +37,9 @@
     algo_verbosity = 0,
 )
 
-# MULTICLUSTERS
-
-ticlMultiClustersFromTrackstersEM = _multiClustersFromTrackstersProducer.clone(
-    Tracksters = "ticlTrackstersEM"
-)
-
 ticlEMStepTask = cms.Task(ticlSeedingGlobal
     ,filteredLayerClustersEM
-    ,ticlTrackstersEM
-    ,ticlMultiClustersFromTrackstersEM)
+    ,ticlTrackstersEM)
 
 filteredLayerClustersHFNoseEM = filteredLayerClustersEM.clone(
     LayerClusters = 'hgcalLayerClustersHFNose',

RecoHGCal/TICL/python/HADStep_cff.py

@@ -4,7 +4,6 @@
 from RecoHGCal.TICL.ticlLayerTileProducer_cfi import ticlLayerTileProducer as _ticlLayerTileProducer
 from RecoHGCal.TICL.trackstersProducer_cfi import trackstersProducer as _trackstersProducer
 from RecoHGCal.TICL.filteredLayerClustersProducer_cfi import filteredLayerClustersProducer as _filteredLayerClustersProducer
-from RecoHGCal.TICL.multiClustersFromTrackstersProducer_cfi import multiClustersFromTrackstersProducer as _multiClustersFromTrackstersProducer
 
 # CLUSTER FILTERING/MASKING
 
@@ -33,16 +32,9 @@
     itername = "HAD"
     )
 
-# MULTICLUSTERS
-
-ticlMultiClustersFromTrackstersHAD = _multiClustersFromTrackstersProducer.clone(
-    Tracksters = "ticlTrackstersHAD"
-    )
-
 ticlHADStepTask = cms.Task(ticlSeedingGlobal
     ,filteredLayerClustersHAD
-    ,ticlTrackstersHAD
-    ,ticlMultiClustersFromTrackstersHAD)
+    ,ticlTrackstersHAD)
 
 filteredLayerClustersHFNoseHAD = _filteredLayerClustersProducer.clone(
     min_cluster_size = 2, # inclusive

RecoHGCal/TICL/python/MIPStep_cff.py

@@ -3,7 +3,6 @@
 from RecoHGCal.TICL.TICLSeedingRegions_cff import ticlSeedingGlobal, ticlSeedingGlobalHFNose
 from RecoHGCal.TICL.trackstersProducer_cfi import trackstersProducer as _trackstersProducer
 from RecoHGCal.TICL.filteredLayerClustersProducer_cfi import filteredLayerClustersProducer as _filteredLayerClustersProducer
-from RecoHGCal.TICL.multiClustersFromTrackstersProducer_cfi import multiClustersFromTrackstersProducer as _multiClustersFromTrackstersProducer
 
 # CLUSTER FILTERING/MASKING
 
@@ -29,16 +28,9 @@
     max_delta_time = -1
 )
 
-# MULTICLUSTERS
-
-ticlMultiClustersFromTrackstersMIP = _multiClustersFromTrackstersProducer.clone(
-    Tracksters = "ticlTrackstersMIP"
-)
-
 ticlMIPStepTask = cms.Task(ticlSeedingGlobal
     ,filteredLayerClustersMIP
-    ,ticlTrackstersMIP
-    ,ticlMultiClustersFromTrackstersMIP)
+    ,ticlTrackstersMIP)
 
 filteredLayerClustersHFNoseMIP = filteredLayerClustersMIP.clone(
     LayerClusters = 'hgcalLayerClustersHFNose',

RecoHGCal/TICL/python/SimTracksters_cff.py

@@ -1,7 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 from RecoHGCal.TICL.trackstersFromSimClustersProducer_cfi import trackstersFromSimClustersProducer as _trackstersFromSimClustersProducer
-from RecoHGCal.TICL.multiClustersFromTrackstersProducer_cfi import multiClustersFromTrackstersProducer as _multiClustersFromTrackstersProducer
 from RecoHGCal.TICL.filteredLayerClustersProducer_cfi import filteredLayerClustersProducer as _filteredLayerClustersProducer
 
 
@@ -23,9 +22,4 @@
     simclusters = "mixData:MergedCaloTruth"
 )
 
-ticlMultiClustersFromSimTracksters = _multiClustersFromTrackstersProducer.clone(
-    Tracksters = "ticlSimTracksters"
-)
-
-ticlSimTrackstersTask = cms.Task(filteredLayerClustersSimTracksters, ticlSimTracksters, ticlMultiClustersFromSimTracksters)
-
+ticlSimTrackstersTask = cms.Task(filteredLayerClustersSimTracksters, ticlSimTracksters)

RecoHGCal/TICL/python/TrkEMStep_cff.py

@@ -3,7 +3,6 @@
 from RecoHGCal.TICL.TICLSeedingRegions_cff import ticlSeedingTrk, ticlSeedingTrkHFNose
 from RecoHGCal.TICL.trackstersProducer_cfi import trackstersProducer as _trackstersProducer
 from RecoHGCal.TICL.filteredLayerClustersProducer_cfi import filteredLayerClustersProducer as _filteredLayerClustersProducer
-from RecoHGCal.TICL.multiClustersFromTrackstersProducer_cfi import multiClustersFromTrackstersProducer as _multiClustersFromTrackstersProducer
 
 # CLUSTER FILTERING/MASKING
 
@@ -37,17 +36,9 @@
     algo_verbosity = 0,
 )
 
-
-# MULTICLUSTERS
-
-ticlMultiClustersFromTrackstersTrkEM = _multiClustersFromTrackstersProducer.clone(
-    Tracksters = "ticlTrackstersTrkEM"
-)
-
 ticlTrkEMStepTask = cms.Task(ticlSeedingTrk
     ,filteredLayerClustersTrkEM
-    ,ticlTrackstersTrkEM
-    ,ticlMultiClustersFromTrackstersTrkEM)
+    ,ticlTrackstersTrkEM)
 
 filteredLayerClustersHFNoseTrkEM = filteredLayerClustersTrkEM.clone(
     LayerClusters = 'hgcalLayerClustersHFNose',

RecoHGCal/TICL/python/TrkStep_cff.py

@@ -4,7 +4,6 @@
 from RecoHGCal.TICL.ticlLayerTileProducer_cfi import ticlLayerTileProducer as _ticlLayerTileProducer
 from RecoHGCal.TICL.trackstersProducer_cfi import trackstersProducer as _trackstersProducer
 from RecoHGCal.TICL.filteredLayerClustersProducer_cfi import filteredLayerClustersProducer as _filteredLayerClustersProducer
-from RecoHGCal.TICL.multiClustersFromTrackstersProducer_cfi import multiClustersFromTrackstersProducer as _multiClustersFromTrackstersProducer
 
 # CLUSTER FILTERING/MASKING
 
@@ -35,15 +34,8 @@
   itername = "Trk"
 )
 
-# MULTICLUSTERS
-
-ticlMultiClustersFromTrackstersTrk = _multiClustersFromTrackstersProducer.clone(
-    Tracksters = "ticlTrackstersTrk"
-)
-
 ticlTrkStepTask = cms.Task(ticlSeedingTrk
     ,filteredLayerClustersTrk
-    ,ticlTrackstersTrk
-    ,ticlMultiClustersFromTrackstersTrk)
+    ,ticlTrackstersTrk)
 
 

RecoHGCal/TICL/python/iterativeTICL_cff.py

@@ -9,15 +9,11 @@
 from RecoHGCal.TICL.ticlLayerTileProducer_cfi import ticlLayerTileProducer
 from RecoHGCal.TICL.pfTICLProducer_cfi import pfTICLProducer as _pfTICLProducer
 from RecoHGCal.TICL.trackstersMergeProducer_cfi import trackstersMergeProducer as _trackstersMergeProducer
-from RecoHGCal.TICL.multiClustersFromTrackstersProducer_cfi import multiClustersFromTrackstersProducer as _multiClustersFromTrackstersProducer
 
 ticlLayerTileTask = cms.Task(ticlLayerTileProducer)
 
 ticlTrackstersMerge = _trackstersMergeProducer.clone()
-ticlMultiClustersFromTrackstersMerge = _multiClustersFromTrackstersProducer.clone(
-    Tracksters = "ticlTrackstersMerge"
-)
-ticlTracksterMergeTask = cms.Task(ticlTrackstersMerge, ticlMultiClustersFromTrackstersMerge)
+ticlTracksterMergeTask = cms.Task(ticlTrackstersMerge)
 
 
 pfTICL = _pfTICLProducer.clone()

RecoHGCal/TICL/python/ticl_iterations.py

@@ -14,15 +14,14 @@
 from RecoHGCal.TICL.ticlLayerTileProducer_cfi import ticlLayerTileProducer
 from RecoHGCal.TICL.trackstersProducer_cfi import trackstersProducer
 from RecoHGCal.TICL.filteredLayerClustersProducer_cfi import filteredLayerClustersProducer
-from RecoHGCal.TICL.multiClustersFromTrackstersProducer_cfi import multiClustersFromTrackstersProducer
 from RecoHGCal.TICL.ticlCandidateFromTrackstersProducer_cfi import ticlCandidateFromTrackstersProducer
 from RecoHGCal.TICL.pfTICLProducer_cfi import pfTICLProducer
 from Validation.HGCalValidation.ticlPFValidationDefault_cfi import ticlPFValidationDefault as ticlPFValidation
 
 ## withReco: requires full reco of the event to run this part
 ## i.e. collections of generalTracks can be accessed
 def TICL_iterations_withReco(process):
-  process.FEVTDEBUGHLTEventContent.outputCommands.extend(['keep *_multiClustersFromTracksters*_*_*',
+  process.FEVTDEBUGHLTEventContent.outputCommands.extend([
     'keep *_ticlCandidateFromTrackstersProducer*_*_*',
     'keep *_pfTICLProducer*_*_*'])
 
@@ -47,11 +46,6 @@ def TICL_iterations_withReco(process):
     min_cos_pointing = 0.9
   )
 
-  process.multiClustersFromTrackstersTrk = multiClustersFromTrackstersProducer.clone(
-      label = "TrkMultiClustersFromTracksterByCA",
-      Tracksters = "trackstersTrk"
-  )
-
   process.ticlSeedingGlobal = ticlSeedingRegionProducer.clone(
     algoId = 2
   )
@@ -73,11 +67,6 @@ def TICL_iterations_withReco(process):
       out_in_dfs = False,
   )
 
-  process.multiClustersFromTrackstersMIP = multiClustersFromTrackstersProducer.clone(
-      label = "MIPMultiClustersFromTracksterByCA",
-      Tracksters = "trackstersMIP"
-  )
-
   process.filteredLayerClusters = filteredLayerClustersProducer.clone(
       clusterFilter = "ClusterFilterByAlgoAndSize",
       min_cluster_size = 2,
@@ -97,11 +86,6 @@ def TICL_iterations_withReco(process):
       min_cos_pointing = 0.9 # ~26 degrees
   )
 
-  process.multiClustersFromTrackstersEM = multiClustersFromTrackstersProducer.clone(
-      Tracksters = "trackstersEM"
-  )
-
-
   process.trackstersHAD = trackstersProducer.clone(
       filtered_mask = "filteredLayerClusters:algo8",
       seeding_regions = "ticlSeedingGlobal",
@@ -111,10 +95,6 @@ def TICL_iterations_withReco(process):
       min_cos_pointing = 0.7
   )
 
-  process.multiClustersFromTrackstersHAD = multiClustersFromTrackstersProducer.clone(
-      Tracksters = "trackstersHAD"
-  )
-
   process.ticlCandidateFromTrackstersProducer = ticlCandidateFromTrackstersProducer.clone()
 
   process.pfTICLProducer = pfTICLProducer.clone()
@@ -125,16 +105,12 @@ def TICL_iterations_withReco(process):
       process.ticlSeedingTrk,
       process.filteredLayerClustersTrk,
       process.trackstersTrk,
-      process.multiClustersFromTrackstersTrk,
       process.ticlSeedingGlobal,
       process.filteredLayerClustersMIP,
       process.trackstersMIP,
-      process.multiClustersFromTrackstersMIP,
       process.filteredLayerClusters,
       process.trackstersEM,
-      process.multiClustersFromTrackstersEM,
       process.trackstersHAD,
-      process.multiClustersFromTrackstersHAD,
       process.ticlCandidateFromTrackstersProducer,
       process.pfTICLProducer)
 
@@ -154,8 +130,6 @@ def TICL_iterations_withReco(process):
 ## TICL_iterations: to be run with local HGCAL reco only
 ## i.e. collections of generalTracks (track-seeded iteration) NOT available
 def TICL_iterations(process):
-  process.FEVTDEBUGHLTEventContent.outputCommands.extend(['keep *_multiClustersFromTracksters*_*_*'])
-
   process.ticlLayerTileProducer = ticlLayerTileProducer.clone()
 
   process.ticlSeedingGlobal = ticlSeedingRegionProducer.clone(
@@ -177,11 +151,6 @@ def TICL_iterations(process):
       min_cos_theta = 0.99, # ~10 degrees
   )
 
-  process.multiClustersFromTrackstersMIP = multiClustersFromTrackstersProducer.clone(
-      label = "MIPMultiClustersFromTracksterByCA",
-      Tracksters = "trackstersMIP"
-  )
-
   process.filteredLayerClusters = filteredLayerClustersProducer.clone(
       clusterFilter = "ClusterFilterByAlgoAndSize",
       min_cluster_size = 2,
@@ -199,10 +168,6 @@ def TICL_iterations(process):
       min_cos_pointing = 0.7
   )
 
-  process.multiClustersFromTracksters = multiClustersFromTrackstersProducer.clone(
-      Tracksters = "tracksters"
-  )
-
   process.HGCalUncalibRecHit = HGCalUncalibRecHit
   process.HGCalRecHit = HGCalRecHit
   process.hgcalLayerClusters = hgcalLayerClusters
@@ -214,10 +179,8 @@ def TICL_iterations(process):
       process.ticlLayerTileProducer,
       process.ticlSeedingGlobal,
       process.trackstersMIP,
-      process.multiClustersFromTrackstersMIP,
       process.filteredLayerClusters,
       process.tracksters,
-      process.multiClustersFromTracksters,
       process.hgcalMultiClusters)
   process.schedule = cms.Schedule(process.raw2digi_step,process.FEVTDEBUGHLToutput_step)
   process.schedule.associate(process.TICL_Task)