TICL: Consolidate v5 as Default Configuration and Cleanup Legacy Code

Configuration/EventContent/python/EventContent_cff.py

@@ -586,8 +586,6 @@ def SwapKeepAndDrop(l):
     outputCommands = FEVTEventContent.outputCommands + RecoLocalFastTimeFEVT.outputCommands)
 phase2_timing_layer.toModify(FEVTEventContent, 
     outputCommands = FEVTEventContent.outputCommands + RecoMTDFEVT.outputCommands)
-from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5
-ticl_v5.toModify(FEVTEventContent, outputCommands=FEVTEventContent.outputCommands+TICLv5_FEVT.outputCommands)
 
 FEVTHLTALLEventContent = cms.PSet(
     outputCommands = cms.untracked.vstring('drop *'),
@@ -675,7 +673,6 @@ def SwapKeepAndDrop(l):
                               outputCommands = [x for x in FEVTDEBUGEventContent.outputCommands if '_hltSiStripClusters2ApproxClusters_' not in x] + [
                                   'keep *_hltSiStripClusters2ApproxClustersv1_*_*'
                               ])
-ticl_v5.toModify(FEVTDEBUGEventContent, outputCommands=FEVTDEBUGEventContent.outputCommands+TICLv5_FEVT.outputCommands)
 #
 #
 # FEVTDEBUGHLT Data Tier definition
@@ -743,7 +740,6 @@ def SwapKeepAndDrop(l):
 phase2_hgcal.toModify(FEVTDEBUGHLTEventContent,
     outputCommands = FEVTDEBUGHLTEventContent.outputCommands + TICL_FEVTHLT.outputCommands)
 
-ticl_v5.toModify(FEVTDEBUGHLTEventContent, outputCommands=FEVTDEBUGHLTEventContent.outputCommands+TICLv5_FEVTHLT.outputCommands)
 
 from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
 

Configuration/ProcessModifiers/python/simTrackstersFromPU_cff.py

@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier enables the SimTracksters from CaloParticles from pileup in the HGCAL associators and simulated objects.
+simTrackstersFromPU = cms.Modifier()

Configuration/ProcessModifiers/python/ticl_dev.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier is for running the development version of TICL.
+
+ticl_dev =  cms.Modifier()

Configuration/ProcessModifiers/python/ticl_superclustering_mustache_pf_cff.py

@@ -1,4 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-# Modifier (to be applied on top of ticl_v5 modifier) to use the pre-TICLv5 superclustering code (that translates tracksters to PFClusters before running Mustache)
+# Modifier to use the pre-TICLv5 superclustering code (that translates tracksters to PFClusters before running Mustache)
 ticl_superclustering_mustache_pf = cms.Modifier() 

Configuration/ProcessModifiers/python/ticl_superclustering_mustache_ticl_cff.py

@@ -1,4 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-# Modifier (to be applied on top of ticl_v5 modifier) to run superclustering using Mustache inside TICL (with tracksters as inputs)
+# Modifier to run superclustering using Mustache inside TICL (with tracksters as inputs)
 ticl_superclustering_mustache_ticl = cms.Modifier() 

Configuration/ProcessModifiers/python/ticlv5_TrackLinkingGNN_cff.py

@@ -1,7 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5
-
 # This modifier is for running TICL v5 with GNN track-trackster linking.
 ticl_v5_TrackLinkingGNN =  cms.Modifier()
-ticlv5_TrackLinkingGNN = cms.ModifierChain(ticl_v5, ticl_v5_TrackLinkingGNN)

Configuration/PyReleaseValidation/README.md

@@ -57,7 +57,6 @@ The offsets currently in use are:
 * 0.7501: HLT phase-2 tracking-only menu
 * 0.751: HLT phase-2 timing menu Alpaka variant
 * 0.7511: HLT phase-2 timing menu, with PixelTracks CA Extension
-* 0.752: HLT phase-2 timing menu ticl_v5 variant
 * 0.753: HLT phase-2 timing menu Alpaka, single tracking iteration variant
 * 0.754: HLT phase-2 timing menu Alpaka, single tracking iteration, LST building variant
 * 0.755: HLT phase-2 timing menu Alpaka, LST building variant
@@ -71,7 +70,7 @@ The offsets currently in use are:
 * 0.759: HLT phase-2 timing menu, with NANO:@Phase2HLT
 * 0.76: HLT phase-2 reduced menu, with DIGI step
 * 0.77: HLT phase-2 NGT Scouting menu
-* 0.771: HLT phase-2 NGT Scouting menu, Alpaka, TICL-v5, TICL-Barrel, CA Extension
+* 0.771: HLT phase-2 NGT Scouting menu, Alpaka, TICL-Barrel, CA Extension
 * 0.772: HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting
 * 0.773: HLT phase-2 NGT Scouting menu, with NANO:@NGTScoutingVal
 * 0.774: HLT phase-2 NGT Scouting menu Alpaka variant, with PixelTracks CA Extension as GeneralTracks
@@ -113,9 +112,6 @@ The offsets currently in use are:
 * 0.914: DDD DB
 * 0.101: Phase-2 aging, 1000fb-1
 * 0.103: Phase-2 aging, 3000fb-1
-* 0.201: HGCAL special TICL Pattern recognition Workflows: clue3D
-* 0.202: HGCAL special TICL Pattern recognition Workflows: FastJet
-* 0.203: HGCAL TICLv5
 * 0.204: HGCAL superclustering : using Mustache in TICLv5
 * 0.205: HGCAL superclustering : using old PFCluster-based Mustache algorithm with TICLv5
 * 0.209: TICL barrel : run TICL in HGCAL and barrel calorimeters

Configuration/PyReleaseValidation/python/MatrixReader.py

@@ -265,9 +265,9 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
                             stepList.pop(0)
                         #print "\t\tmod",stepList
                         break
-
             for (stepI,step) in enumerate(stepList):
                 stepName=step
+
                 if self.relvalModule.steps[stepName] is None:
                     continue
                 if self.wm:

Configuration/PyReleaseValidation/python/relval_Run4.py

@@ -56,8 +56,7 @@
 numWFIB.extend([prefixDet+34.7501])# HLTTrackingOnly75e33
 numWFIB.extend([prefixDet+34.751]) # HLTTiming75e33, alpaka
 numWFIB.extend([prefixDet+34.7511])# HLTTiming75e33, phase2CAExtension
-numWFIB.extend([prefixDet+34.752]) # HLTTiming75e33, ticl_v5
-numWFIB.extend([prefixDet+34.7521])# HLTTiming75e33, ticl_v5, ticlv5TrackLinkingGNN
+numWFIB.extend([prefixDet+34.7521])# HLTTiming75e33, ticlv5TrackLinkingGNN
 numWFIB.extend([prefixDet+34.753]) # HLTTiming75e33, alpaka,singleIterPatatrack
 numWFIB.extend([prefixDet+34.754]) # HLTTiming75e33, alpaka,singleIterPatatrack,trackingLST
 numWFIB.extend([prefixDet+34.755]) # HLTTiming75e33, alpaka,trackingLST
@@ -70,7 +69,7 @@
 numWFIB.extend([prefixDet+34.758]) # HLTTiming75e33, ticl_barrel
 numWFIB.extend([prefixDet+34.759]) # HLTTiming75e33 + NANO
 numWFIB.extend([prefixDet+34.77])  # NGTScouting
-numWFIB.extend([prefixDet+34.771]) # NGTScouting + alpaka + TICL-v5 + TICL-Barrel
+numWFIB.extend([prefixDet+34.771]) # NGTScouting + alpaka + TICL-Barrel
 numWFIB.extend([prefixDet+34.772]) # NGTScouting + NANO
 numWFIB.extend([prefixDet+34.773]) # NGTScouting + NANO (including validation)
 numWFIB.extend([prefixDet+34.774])  # NGTScouting + Phase2CAExtension as GeneneralTracks

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -779,89 +779,6 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
 }
 
-# Special TICL Pattern recognition Workflows
-class UpgradeWorkflow_ticl_clue3D(UpgradeWorkflow):
-    def setup_(self, step, stepName, stepDict, k, properties):
-        if 'RecoGlobal' in step:
-            stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
-        if 'HARVESTGlobal' in step:
-            stepDict[stepName][k] = merge([self.step4, stepDict[step][k]])
-    def condition(self, fragment, stepList, key, hasHarvest):
-        return (fragment=="TTbar_14TeV" or 'CloseByPGun_CE' in fragment) and 'Run4' in key
-upgradeWFs['ticl_clue3D'] = UpgradeWorkflow_ticl_clue3D(
-    steps = [
-        'RecoGlobal',
-        'RecoGlobalFakeHLT',
-        'HARVESTGlobal'
-    ],
-    PU = [
-        'RecoGlobal',
-        'RecoGlobalFakeHLT',
-        'HARVESTGlobal'
-    ],
-    suffix = '_ticl_clue3D',
-    offset = 0.201,
-)
-upgradeWFs['ticl_clue3D'].step3 = {'--procModifiers': 'clue3D'}
-upgradeWFs['ticl_clue3D'].step4 = {'--procModifiers': 'clue3D'}
-
-class UpgradeWorkflow_ticl_FastJet(UpgradeWorkflow):
-    def setup_(self, step, stepName, stepDict, k, properties):
-        if 'RecoGlobal' in step:
-            stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
-        if 'HARVESTGlobal' in step:
-            stepDict[stepName][k] = merge([self.step4, stepDict[step][k]])
-    def condition(self, fragment, stepList, key, hasHarvest):
-        return (fragment=="TTbar_14TeV" or 'CloseByPGun_CE' in fragment) and 'Run4' in key
-upgradeWFs['ticl_FastJet'] = UpgradeWorkflow_ticl_FastJet(
-    steps = [
-        'RecoGlobal',
-        'RecoGlobalFakeHLT',
-        'HARVESTGlobal'
-    ],
-    PU = [
-        'RecoGlobal',
-        'RecoGlobalFakeHLT',
-        'HARVESTGlobal'
-    ],
-    suffix = '_ticl_FastJet',
-    offset = 0.202,
-)
-upgradeWFs['ticl_FastJet'].step3 = {'--procModifiers': 'fastJetTICL'}
-upgradeWFs['ticl_FastJet'].step4 = {'--procModifiers': 'fastJetTICL'}
-
-class UpgradeWorkflow_ticl_v5(UpgradeWorkflow):
-    def setup_(self, step, stepName, stepDict, k, properties):
-        if ('Digi' in step and 'NoHLT' not in step) or ('HLTOnly' in step):
-            stepDict[stepName][k] = merge([self.step2, stepDict[step][k]])
-        if 'RecoGlobal' in step:
-            stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
-        if 'HARVESTGlobal' in step:
-            stepDict[stepName][k] = merge([self.step4, stepDict[step][k]])
-    def condition(self, fragment, stepList, key, hasHarvest):
-        selected_fragments = ["TTbar_14TeV", "CloseByP", "Eta1p7_2p7", "ZEE_14"]
-        return any(sf in fragment for sf in selected_fragments) and 'Run4' in key
-
-upgradeWFs['ticl_v5'] = UpgradeWorkflow_ticl_v5(
-    steps = [
-        'HLTOnly',
-        'DigiTrigger',
-        'RecoGlobal',
-        'HARVESTGlobal'
-    ],
-    PU = [
-        'HLTOnly',
-        'DigiTrigger',
-        'RecoGlobal',
-        'HARVESTGlobal'
-    ],
-    suffix = '_ticl_v5',
-    offset = 0.203,
-)
-upgradeWFs['ticl_v5'].step2 = {'--procModifiers': 'ticl_v5'}
-upgradeWFs['ticl_v5'].step3 = {'--procModifiers': 'ticl_v5'}
-upgradeWFs['ticl_v5'].step4 = {'--procModifiers': 'ticl_v5'}
-
 class UpgradeWorkflow_ticl_v5_superclustering(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
         if ('Digi' in step and 'NoHLT' not in step) or ('HLTOnly' in step):
@@ -888,9 +805,9 @@ def condition(self, fragment, stepList, key, hasHarvest):
     suffix = '_ticl_v5_mustache',
     offset = 0.204,
 )
-upgradeWFs['ticl_v5_superclustering_mustache_ticl'].step2 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_ticl'}
-upgradeWFs['ticl_v5_superclustering_mustache_ticl'].step3 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_ticl'}
-upgradeWFs['ticl_v5_superclustering_mustache_ticl'].step4 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_ticl'}
+upgradeWFs['ticl_v5_superclustering_mustache_ticl'].step2 = {'--procModifiers': 'ticl_superclustering_mustache_ticl'}
+upgradeWFs['ticl_v5_superclustering_mustache_ticl'].step3 = {'--procModifiers': 'ticl_superclustering_mustache_ticl'}
+upgradeWFs['ticl_v5_superclustering_mustache_ticl'].step4 = {'--procModifiers': 'ticl_superclustering_mustache_ticl'}
 
 upgradeWFs['ticl_v5_superclustering_mustache_pf'] = UpgradeWorkflow_ticl_v5_superclustering(
     steps = [
@@ -906,8 +823,8 @@ def condition(self, fragment, stepList, key, hasHarvest):
     suffix = '_ticl_v5_mustache_pf',
     offset = 0.205,
 )
-upgradeWFs['ticl_v5_superclustering_mustache_pf'].step3 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_pf'}
-upgradeWFs['ticl_v5_superclustering_mustache_pf'].step4 = {'--procModifiers': 'ticl_v5,ticl_superclustering_mustache_pf'}
+upgradeWFs['ticl_v5_superclustering_mustache_pf'].step3 = {'--procModifiers': 'ticl_superclustering_mustache_pf'}
+upgradeWFs['ticl_v5_superclustering_mustache_pf'].step4 = {'--procModifiers': 'ticl_superclustering_mustache_pf'}
 
 class UpgradeWorkflow_TICLdumper(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
@@ -928,28 +845,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
 )
 upgradeWFs['enableTICLdumper'].step3 = {'--customise': 'RecoHGCal/TICL/customiseTICLFromReco.customiseTICLForDumper'}
 
-upgradeWFs['ticl_v5_withDumper'] = UpgradeWorkflow_ticl_v5(
-    steps = [
-        'HLTOnly',
-        'DigiTrigger',
-        'RecoGlobal',
-        'HARVESTGlobal'
-    ],
-    PU = [
-        'HLTOnly',
-        'DigiTrigger',
-        'RecoGlobal',
-        'HARVESTGlobal'
-    ],
-    suffix = '_ticl_v5_withDumper',
-    offset = 0.207,
-)
-upgradeWFs['ticl_v5_withDumper'].step2 = {'--procModifiers': 'ticl_v5'}
-upgradeWFs['ticl_v5_withDumper'].step3 = {'--procModifiers': 'ticl_v5',
-                                          '--customise': 'RecoHGCal/TICL/customiseTICLFromReco.customiseTICLForDumper'}
-upgradeWFs['ticl_v5_withDumper'].step4 = {'--procModifiers': 'ticl_v5'}
-
-class UpgradeWorkflow_CPfromPU(UpgradeWorkflow):
+class UpgradeWorkflow_simTrackstersFromPU(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
         if ('Digi' in step and 'NoHLT' not in step) or ('HLTOnly' in step):
             stepDict[stepName][k] = merge([self.step2, stepDict[step][k]])
@@ -960,7 +856,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
     def condition(self, fragment, stepList, key, hasHarvest):
         return (fragment=="TTbar_14TeV" or 'CloseByP' in fragment or 'Eta1p7_2p7' in fragment) and 'Run4' in key
 
-upgradeWFs['CPfromPU'] = UpgradeWorkflow_CPfromPU(
+upgradeWFs['simTrackstersFromPU'] = UpgradeWorkflow_simTrackstersFromPU(
     steps = [
         'HLTOnly',
         'DigiTrigger',
@@ -973,13 +869,13 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'RecoGlobal',
         'HARVESTGlobal'
     ],
-    suffix = '_withCPfromPU',
+    suffix = '_simTrackstersFromPU',
     offset = 0.208,
 )
 
-upgradeWFs['CPfromPU'].step2 = {'--procModifiers': 'enableCPfromPU'}
-upgradeWFs['CPfromPU'].step3 = {'--procModifiers': 'enableCPfromPU'}
-upgradeWFs['CPfromPU'].step4 = {'--procModifiers': 'enableCPfromPU'}
+upgradeWFs['simTrackstersFromPU'].step2 = {'--procModifiers': 'simTrackstersFromPU'}
+upgradeWFs['simTrackstersFromPU'].step3 = {'--procModifiers': 'simTrackstersFromPU'}
+upgradeWFs['simTrackstersFromPU'].step4 = {'--procModifiers': 'simTrackstersFromPU'}
 
 class UpgradeWorkflow_ticl_barrel(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
@@ -1012,7 +908,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
 upgradeWFs['ticl_barrel'].step3 = {'--procModifiers': 'ticl_barrel'}
 upgradeWFs['ticl_barrel'].step4 = {'--procModifiers': 'ticl_barrel'}
 
-class UpgradeWorkflow_ticl_barrel_CPfromPU(UpgradeWorkflow):
+class UpgradeWorkflow_ticl_barrel_simTrackstersFromPU(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
         if ('Digi' in step and 'NoHLT' not in step) or ('HLTOnly' in step):
             stepDict[stepName][k] = merge([self.step2, stepDict[step][k]])
@@ -1023,7 +919,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
     def condition(self, fragment, stepList, key, hasHarvest):
         return ('CloseByPGun_Barrel') in fragment and ('Run4' in key) and ('PU' in key)
 
-upgradeWFs['ticl_barrel_CPfromPU'] = UpgradeWorkflow_ticl_barrel_CPfromPU(
+upgradeWFs['ticl_barrel_simTrackstersFromPU'] = UpgradeWorkflow_ticl_barrel_simTrackstersFromPU(
     steps = [
         'HLTOnly',
         'DigiTrigger',
@@ -1036,12 +932,12 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'RecoGlobal',
         'HARVESTGlobal'
     ],
-    suffix = '_ticl_barrel_CPfromPU',
+    suffix = '_ticl_barrel_simTrackstersFromPU',
     offset = 0.2091,
 )
-upgradeWFs['ticl_barrel_CPfromPU'].step2 = {'--procModifiers': 'ticl_barrel,enableCPfromPU'}
-upgradeWFs['ticl_barrel_CPfromPU'].step3 = {'--procModifiers': 'ticl_barrel,enableCPfromPU'}
-upgradeWFs['ticl_barrel_CPfromPU'].step4 = {'--procModifiers': 'ticl_barrel,enableCPfromPU'}
+upgradeWFs['ticl_barrel_simTrackstersFromPU'].step2 = {'--procModifiers': 'ticl_barrel,simTrackstersFromPU'}
+upgradeWFs['ticl_barrel_simTrackstersFromPU'].step3 = {'--procModifiers': 'ticl_barrel,simTrackstersFromPU'}
+upgradeWFs['ticl_barrel_simTrackstersFromPU'].step4 = {'--procModifiers': 'ticl_barrel,simTrackstersFromPU'}
 
 class UpgradeWorkflow_ticlv5_TrackLinkingGNN(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
@@ -1943,18 +1839,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '--eventcontent':'FEVTDEBUGHLT,DQMIO'
 }
 
-upgradeWFs['HLTTiming75e33TiclV5'] = deepcopy(upgradeWFs['HLTTiming75e33'])
-upgradeWFs['HLTTiming75e33TiclV5'].suffix = '_HLT75e33TimingTiclV5'
-upgradeWFs['HLTTiming75e33TiclV5'].offset = 0.752
-upgradeWFs['HLTTiming75e33TiclV5'].step2 = {
-    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
-    '--procModifiers': 'ticl_v5',
-    '--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
-    '--eventcontent':'FEVTDEBUGHLT,DQMIO'
-}
-upgradeWFs['HLTTiming75e33TiclV5'].step3 = {
-    '-s':'HARVESTING:@hltValidation'
-}
+
 
 upgradeWFs['HLTTiming75e33TiclV5TrackLinkingGNN'] = deepcopy(upgradeWFs['HLTTiming75e33'])
 upgradeWFs['HLTTiming75e33TiclV5TrackLinkingGNN'].suffix = '_HLT75e33TimingTiclV5TrackLinkGNN'
@@ -2250,12 +2135,12 @@ def condition(self, fragment, stepList, key, hasHarvest):
 upgradeWFs['NGTScoutingAll'].offset = 0.771
 upgradeWFs['NGTScoutingAll'].step2 = {
     '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:NGTScouting,VALIDATION:@hltValidation',
-    '--procModifiers': 'ngtScouting,alpaka,ticl_v5,ticl_barrel,phase2CAExtension',
+    '--procModifiers': 'ngtScouting,alpaka,ticl_barrel,phase2CAExtension',
     '--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
     '--eventcontent':'FEVTDEBUGHLT,DQMIO'
 }
 upgradeWFs['NGTScoutingAll'].step3 = {
-    '--procModifiers': 'ngtScouting,alpaka,ticl_v5,ticl_barrel',
+    '--procModifiers': 'ngtScouting,alpaka,ticl_barrel',
    '-s':'HARVESTING:@hltValidation'
 }