From afe768ef28325d21e9abe20dcf635b3563e769b9 Mon Sep 17 00:00:00 2001 From: rselvati Date: Mon, 16 Sep 2024 14:43:59 +0200 Subject: [PATCH 01/10] Add supercluster DNN to Phase2 HLT --- .../python/upgradeWorkflowComponents.py | 7 +++ .../hltEgammaCandidatesL1Seeded_cfi.py | 3 + .../hltEgammaCandidatesUnseeded_cfi.py | 3 + ...ClusteringForEgammaL1SeededSequence_cfi.py | 45 ++++++++++++++ ...ClusteringForEgammaUnseededSequence_cfi.py | 58 +++++++++++++++++-- 5 files changed, 110 insertions(+), 6 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index ca598ab630c1e..426c97f6e57c8 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -717,6 +717,8 @@ def condition(self, fragment, stepList, key, hasHarvest): 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): + 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: @@ -725,16 +727,21 @@ def condition(self, fragment, stepList, key, hasHarvest): return (fragment=="ZEE_14" or 'Eta1p7_2p7' in fragment) and '2026' in key upgradeWFs['ticl_v5_superclustering_mustache_ticl'] = UpgradeWorkflow_ticl_v5_superclustering( steps = [ + 'HLTOnly', + 'DigiTrigger', 'RecoGlobal', 'HARVESTGlobal' ], PU = [ + 'HLTOnly', + 'DigiTrigger', 'RecoGlobal', 'HARVESTGlobal' ], 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'} diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py index 5ffac6c80b413..3dbbe586baac5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py @@ -5,3 +5,6 @@ scHybridBarrelProducer = cms.InputTag("hltParticleFlowSuperClusterECALL1Seeded","particleFlowSuperClusterECALBarrel"), scIslandEndcapProducer = cms.InputTag("hltParticleFlowSuperClusterHGCalFromTICLL1Seeded") ) + +from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 +ticl_v5.toModify(hltEgammaCandidatesL1Seeded, scIslandEndcapProducer = cms.InputTag("hltTiclEGammaSuperClusterProducerL1Seeded")) \ No newline at end of file diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py index f1f51a98e480c..60e95bc3ac9ab 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py @@ -5,3 +5,6 @@ scHybridBarrelProducer = cms.InputTag("hltParticleFlowSuperClusterECALUnseeded","particleFlowSuperClusterECALBarrel"), scIslandEndcapProducer = cms.InputTag("hltParticleFlowSuperClusterHGCalFromTICLUnseeded") ) + +from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 +ticl_v5.toModify(hltEgammaCandidatesUnseeded, scIslandEndcapProducer = cms.InputTag("hltTiclEGammaSuperClusterProducerUnseeded")) \ No newline at end of file diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py index 53faf7266150d..3873cb5f642c6 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py @@ -17,5 +17,50 @@ from ..modules.hltTiclLayerTileProducerL1Seeded_cfi import * from ..modules.hltTiclSeedingL1_cfi import * from ..modules.hltTiclTrackstersCLUE3DHighL1Seeded_cfi import * +from ..modules.hltTiclTracksterLinksL1Seeded_cfi import * +from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 +from RecoHGCal.TICL.ticlEGammaSuperClusterProducer_cfi import ticlEGammaSuperClusterProducer +from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn +from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl HLTHgcalTiclPFClusteringForEgammaL1SeededSequence = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded+hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded+hltParticleFlowClusterHGCalFromTICLL1Seeded+hltParticleFlowSuperClusterHGCalFromTICLL1Seeded) + + +# Enable EGammaSuperClusterProducer at HLT in ticl v5 +hltTiclTracksterLinksSuperclusteringDNNL1Seeded = hltTiclTracksterLinksL1Seeded.clone( + linkingPSet = cms.PSet( + type=cms.string("SuperClusteringDNN"), + algo_verbosity=cms.int32(0), + onnxModelPath = cms.FileInPath("RecoHGCal/TICL/data/superclustering/supercls_v2p1.onnx"), + nnWorkingPoint=cms.double(0.3), + ), + tracksters_collections = [cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded")], # to be changed to ticlTrackstersCLUE3DEM once separate CLUE3D iterations are introduced +) + +hltTiclTracksterLinksSuperclusteringMustacheL1Seeded = hltTiclTracksterLinksL1Seeded.clone( + linkingPSet = cms.PSet( + type=cms.string("SuperClusteringMustache"), + algo_verbosity=cms.int32(0) + ), + tracksters_collections = [cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded")], # to be changed to ticlTrackstersCLUE3DEM once separate CLUE3D iterations are introduced +) + +hltTiclEGammaSuperClusterProducerL1Seeded = ticlEGammaSuperClusterProducer.clone() + +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_ticlv5_DNN = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded+hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded+hltTiclTracksterLinksSuperclusteringDNNL1Seeded+hltTiclEGammaSuperClusterProducerL1Seeded) + +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_ticlv5_mustache = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded+hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded+hltTiclTracksterLinksSuperclusteringMustacheL1Seeded+hltTiclEGammaSuperClusterProducerL1Seeded) + +# DNN +ticl_superclustering_dnn.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaL1SeededSequence, HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_ticlv5_DNN) +ticl_superclustering_dnn.toModify(hltTiclEGammaSuperClusterProducerL1Seeded, + ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNL1Seeded"), + ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), + layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded")) + +# Mustache +ticl_superclustering_mustache_ticl.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaL1SeededSequence, HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_ticlv5_mustache) +ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerL1Seeded, + ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheL1Seeded"), + ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), + layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded")) \ No newline at end of file diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py index 98bd6184ca196..97a3b6aa8194b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py @@ -18,13 +18,59 @@ from ..modules.hltHgcalSoARecHitsLayerClustersProducer_cfi import * from ..modules.hltHgcalSoALayerClustersProducer_cfi import * from ..modules.hltHgcalLayerClustersFromSoAProducer_cfi import * +from ..modules.hltTiclTracksterLinksUnseeded_cfi import * +from RecoHGCal.TICL.ticlEGammaSuperClusterProducer_cfi import ticlEGammaSuperClusterProducer +from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 +from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn +from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) -_HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) +#_HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) -from Configuration.ProcessModifiers.alpaka_cff import alpaka -alpaka.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, _HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous) -alpaka.toModify(hltHgcalMergeLayerClusters, - layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) +#from Configuration.ProcessModifiers.alpaka_cff import alpaka +#alpaka.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, _HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous) +#alpaka.toModify(hltHgcalMergeLayerClusters, +# layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), +# time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) + + +# Enable EGammaSuperClusterProducer at HLT in ticl v5 + +hltTiclTracksterLinksSuperclusteringDNNUnseeded = hltTiclTracksterLinksUnseeded.clone( + linkingPSet = cms.PSet( + type=cms.string("SuperClusteringDNN"), + algo_verbosity=cms.int32(0), + onnxModelPath = cms.FileInPath("RecoHGCal/TICL/data/superclustering/supercls_v2p1.onnx"), + nnWorkingPoint=cms.double(0.3), + ), + tracksters_collections = [cms.InputTag("hltTiclTrackstersCLUE3DHigh")], # to be changed to ticlTrackstersCLUE3DEM once separate CLUE3D iterations are introduced +) + +hltTiclTracksterLinksSuperclusteringMustacheUnseeded = hltTiclTracksterLinksUnseeded.clone( + linkingPSet = cms.PSet( + type=cms.string("SuperClusteringMustache"), + algo_verbosity=cms.int32(0) + ), + tracksters_collections = [cms.InputTag("hltTiclTrackstersCLUE3DHigh")], # to be changed to ticlTrackstersCLUE3DEM once separate CLUE3D iterations are introduced +) + +hltTiclEGammaSuperClusterProducerUnseeded = ticlEGammaSuperClusterProducer.clone() + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltTiclTracksterLinksSuperclusteringDNNUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltTiclTracksterLinksSuperclusteringMustacheUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) + +# DNN +ticl_superclustering_dnn.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN) +ticl_superclustering_dnn.toModify(hltTiclEGammaSuperClusterProducerUnseeded, + ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNUnseeded"), + ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) + +# Mustache +ticl_superclustering_mustache_ticl.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache) +ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerUnseeded, + ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), + ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) \ No newline at end of file From 09dedb8a7664056c05916b054dfdb771b4cf825d Mon Sep 17 00:00:00 2001 From: rselvati Date: Mon, 16 Sep 2024 14:47:11 +0200 Subject: [PATCH 02/10] re-enable alpaka modifier --- ...TiclPFClusteringForEgammaUnseededSequence_cfi.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py index 97a3b6aa8194b..7550ae258b9a1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py @@ -26,17 +26,16 @@ HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) -#_HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) +_HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) -#from Configuration.ProcessModifiers.alpaka_cff import alpaka -#alpaka.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, _HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous) -#alpaka.toModify(hltHgcalMergeLayerClusters, -# layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), -# time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) +from Configuration.ProcessModifiers.alpaka_cff import alpaka +alpaka.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, _HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous) +alpaka.toModify(hltHgcalMergeLayerClusters, + layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) # Enable EGammaSuperClusterProducer at HLT in ticl v5 - hltTiclTracksterLinksSuperclusteringDNNUnseeded = hltTiclTracksterLinksUnseeded.clone( linkingPSet = cms.PSet( type=cms.string("SuperClusteringDNN"), From 939de96f31d8c8333248d818d94fffc88c98570d Mon Sep 17 00:00:00 2001 From: rselvati Date: Mon, 16 Sep 2024 14:48:44 +0200 Subject: [PATCH 03/10] Add TracksterLinks modules --- .../hltTiclTracksterLinksL1Seeded_cfi.py | 34 +++++++++++++++++++ .../hltTiclTracksterLinksUnseeded_cfi.py | 34 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py create mode 100644 HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py new file mode 100644 index 0000000000000..610d4f68fce97 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py @@ -0,0 +1,34 @@ +import FWCore.ParameterSet.Config as cms + +hltTiclTracksterLinksL1Seeded = cms.EDProducer("TracksterLinksProducer", + detector = cms.string('HGCAL'), + eid_input_name = cms.string('input'), + eid_min_cluster_energy = cms.double(2.5), + eid_n_clusters = cms.int32(10), + eid_n_layers = cms.int32(50), + eid_output_name_energy = cms.string('output/regressed_energy'), + eid_output_name_id = cms.string('output/id_probabilities'), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), + layer_clustersTime = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded","timeLayerCluster"), + linkingPSet = cms.PSet( + algo_verbosity = cms.int32(0), + cylinder_radius_sqr = cms.vdouble(9, 9), + dot_prod_th = cms.double(0.97), + max_distance_projective_sqr = cms.vdouble(60, 60), + max_distance_projective_sqr_closest_points = cms.vdouble(60, 60), + max_z_distance_closest_points = cms.vdouble(35, 35), + min_distance_z = cms.vdouble(30, 30), + min_num_lcs = cms.uint32(7), + min_trackster_energy = cms.double(10), + pca_quality_th = cms.double(0.85), + track_time_quality_threshold = cms.double(0.5), + type = cms.string('Skeletons'), + wind = cms.double(0.036) + ), + mightGet = cms.optional.untracked.vstring, + original_masks = cms.VInputTag("hltHgcalMergeLayerClustersL1Seeded:InitialLayerClustersMask"), + propagator = cms.string('PropagatorWithMaterial'), + regressionAndPid = cms.bool(True), + tfDnnLabel = cms.string('tracksterSelectionTf'), + tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHighL1Seeded", "hltTiclTrackstersPassthrough") +) \ No newline at end of file diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py new file mode 100644 index 0000000000000..88dd166dd9559 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py @@ -0,0 +1,34 @@ +import FWCore.ParameterSet.Config as cms + +hltTiclTracksterLinksUnseeded = cms.EDProducer("TracksterLinksProducer", + detector = cms.string('HGCAL'), + eid_input_name = cms.string('input'), + eid_min_cluster_energy = cms.double(2.5), + eid_n_clusters = cms.int32(10), + eid_n_layers = cms.int32(50), + eid_output_name_energy = cms.string('output/regressed_energy'), + eid_output_name_id = cms.string('output/id_probabilities'), + layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"), + layer_clustersTime = cms.InputTag("hltHgcalMergeLayerClusters","timeLayerCluster"), + linkingPSet = cms.PSet( + algo_verbosity = cms.int32(0), + cylinder_radius_sqr = cms.vdouble(9, 9), + dot_prod_th = cms.double(0.97), + max_distance_projective_sqr = cms.vdouble(60, 60), + max_distance_projective_sqr_closest_points = cms.vdouble(60, 60), + max_z_distance_closest_points = cms.vdouble(35, 35), + min_distance_z = cms.vdouble(30, 30), + min_num_lcs = cms.uint32(7), + min_trackster_energy = cms.double(10), + pca_quality_th = cms.double(0.85), + track_time_quality_threshold = cms.double(0.5), + type = cms.string('Skeletons'), + wind = cms.double(0.036) + ), + mightGet = cms.optional.untracked.vstring, + original_masks = cms.VInputTag("hltHgcalMergeLayerClusters:InitialLayerClustersMask"), + propagator = cms.string('PropagatorWithMaterial'), + regressionAndPid = cms.bool(True), + tfDnnLabel = cms.string('tracksterSelectionTf'), + tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersPassthrough") +) \ No newline at end of file From c07352ef10e258ef6f3ff3e4cef31f1e8c08e68b Mon Sep 17 00:00:00 2001 From: rselvati Date: Mon, 16 Sep 2024 17:07:32 +0200 Subject: [PATCH 04/10] Add ticlv5 and alpaka --- ...ClusteringForEgammaUnseededSequence_cfi.py | 71 +++++++++++++++---- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py index 7550ae258b9a1..8e572645a3219 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py @@ -24,16 +24,7 @@ from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl -HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) - -_HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) - -from Configuration.ProcessModifiers.alpaka_cff import alpaka -alpaka.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, _HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous) -alpaka.toModify(hltHgcalMergeLayerClusters, - layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) - +#HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) # Enable EGammaSuperClusterProducer at HLT in ticl v5 hltTiclTracksterLinksSuperclusteringDNNUnseeded = hltTiclTracksterLinksUnseeded.clone( @@ -56,9 +47,34 @@ hltTiclEGammaSuperClusterProducerUnseeded = ticlEGammaSuperClusterProducer.clone() -HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltTiclTracksterLinksSuperclusteringDNNUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) +# All the sequences that will be used +_HgcalLocalRecoUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters) +_HgcalTrackstersUnseededSequence = cms.Sequence(hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh) +_SuperclusteringUnseededSequence = cms.Sequence(hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) +_HgcalLocalRecoUnseededSequence_heterogeneous = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters) +_SuperclusteringUnseededSequence_ticlv5_DNN = cms.Sequence(hltTiclTracksterLinksSuperclusteringDNNUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) +_SuperclusteringUnseededSequence_ticlv5_mustache = cms.Sequence(hltTiclTracksterLinksSuperclusteringMustacheUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) + +# The baseline sequence +HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(_HgcalLocalRecoUnseededSequence + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence) + +# The alpaka sequence +HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(_HgcalLocalRecoUnseededSequence_heterogeneous + _SuperclusteringUnseededSequence + _SuperclusteringUnseededSequence) + +from Configuration.ProcessModifiers.alpaka_cff import alpaka +alpaka.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous) +alpaka.toModify(hltHgcalMergeLayerClusters, + layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) + +# The ticlv5 sequences +HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN = cms.Sequence(_HgcalLocalRecoUnseededSequence + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence_ticlv5_DNN) + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache = cms.Sequence(_HgcalLocalRecoUnseededSequence + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence_ticlv5_mustache) -HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltTiclTracksterLinksSuperclusteringMustacheUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) +#HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltTiclTracksterLinksSuperclusteringDNNUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) + +#HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltTiclTracksterLinksSuperclusteringMustacheUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) # DNN ticl_superclustering_dnn.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN) @@ -70,6 +86,31 @@ # Mustache ticl_superclustering_mustache_ticl.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache) ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerUnseeded, - ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), - ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) \ No newline at end of file + ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), + ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) + +# ticlv5 heterogeneous +HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN_heterogeneous = cms.Sequence(_HgcalLocalRecoUnseededSequence_heterogeneous + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence_ticlv5_DNN) + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache_heterogeneous = cms.Sequence(_HgcalLocalRecoUnseededSequence_heterogeneous + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence_ticlv5_mustache) + +# alpaka & DNN +(alpaka & ticl_superclustering_dnn).toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN_heterogeneous) +(alpaka & ticl_superclustering_dnn).toModify(hltTiclEGammaSuperClusterProducerUnseeded, + ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNUnseeded"), + ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) +(alpaka & ticl_superclustering_dnn).toModify(hltHgcalMergeLayerClusters, + layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) + +# alpaka & mustache +(alpaka & ticl_superclustering_mustache_ticl).toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache_heterogeneous) +(alpaka & ticl_superclustering_mustache_ticl).toModify(hltTiclEGammaSuperClusterProducerUnseeded, + ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), + ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) +(alpaka & ticl_superclustering_mustache_ticl).toModify(hltHgcalMergeLayerClusters, + layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) \ No newline at end of file From 74df5f2b3e7ed55feead104e7598b6ff07038ce5 Mon Sep 17 00:00:00 2001 From: rselvati Date: Mon, 16 Sep 2024 23:45:06 +0200 Subject: [PATCH 05/10] Change structure of sequences --- ...ClusteringForEgammaL1SeededSequence_cfi.py | 34 ++-- ...ClusteringForEgammaUnseededSequence_cfi.py | 150 +++++++++++------- 2 files changed, 116 insertions(+), 68 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py index 3873cb5f642c6..06653b3bcdd99 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py @@ -18,13 +18,13 @@ from ..modules.hltTiclSeedingL1_cfi import * from ..modules.hltTiclTrackstersCLUE3DHighL1Seeded_cfi import * from ..modules.hltTiclTracksterLinksL1Seeded_cfi import * -from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -from RecoHGCal.TICL.ticlEGammaSuperClusterProducer_cfi import ticlEGammaSuperClusterProducer -from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn -from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl -HLTHgcalTiclPFClusteringForEgammaL1SeededSequence = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded+hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded+hltParticleFlowClusterHGCalFromTICLL1Seeded+hltParticleFlowSuperClusterHGCalFromTICLL1Seeded) +_HgcalLocalRecoL1SeededSequence = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded) +_HgcalTICLPatternRecognitionL1SeededSequence = cms.Sequence(hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded) +_SuperclusteringUnseededSequence = cms.Sequence(hltParticleFlowClusterHGCalFromTICLL1Seeded+hltParticleFlowSuperClusterHGCalFromTICLL1Seeded) +# The baseline sequence +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence = cms.Sequence(_HgcalLocalRecoL1SeededSequence + _HgcalTICLPatternRecognitionL1SeededSequence + _SuperclusteringUnseededSequence) # Enable EGammaSuperClusterProducer at HLT in ticl v5 hltTiclTracksterLinksSuperclusteringDNNL1Seeded = hltTiclTracksterLinksL1Seeded.clone( @@ -45,22 +45,32 @@ tracksters_collections = [cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded")], # to be changed to ticlTrackstersCLUE3DEM once separate CLUE3D iterations are introduced ) +from RecoHGCal.TICL.ticlEGammaSuperClusterProducer_cfi import ticlEGammaSuperClusterProducer hltTiclEGammaSuperClusterProducerL1Seeded = ticlEGammaSuperClusterProducer.clone() -HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_ticlv5_DNN = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded+hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded+hltTiclTracksterLinksSuperclusteringDNNL1Seeded+hltTiclEGammaSuperClusterProducerL1Seeded) - -HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_ticlv5_mustache = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded+hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded+hltTiclTracksterLinksSuperclusteringMustacheL1Seeded+hltTiclEGammaSuperClusterProducerL1Seeded) - # DNN -ticl_superclustering_dnn.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaL1SeededSequence, HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_ticlv5_DNN) +from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn +ticl_superclustering_dnn.toReplaceWith(_SuperclusteringUnseededSequence, + cms.Sequence( + hltTiclTracksterLinksSuperclusteringDNNL1Seeded + + hltTiclEGammaSuperClusterProducerL1Seeded + ) +) ticl_superclustering_dnn.toModify(hltTiclEGammaSuperClusterProducerL1Seeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNL1Seeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded")) # Mustache -ticl_superclustering_mustache_ticl.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaL1SeededSequence, HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_ticlv5_mustache) +from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl +ticl_superclustering_mustache_ticl.toReplaceWith(_SuperclusteringUnseededSequence, + cms.Sequence( + hltTiclTracksterLinksSuperclusteringMustacheL1Seeded + + hltTiclEGammaSuperClusterProducerL1Seeded + ) +) ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerL1Seeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheL1Seeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded")) \ No newline at end of file + layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded") + ) \ No newline at end of file diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py index 8e572645a3219..7f99bbff6d5af 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py @@ -19,14 +19,36 @@ from ..modules.hltHgcalSoALayerClustersProducer_cfi import * from ..modules.hltHgcalLayerClustersFromSoAProducer_cfi import * from ..modules.hltTiclTracksterLinksUnseeded_cfi import * -from RecoHGCal.TICL.ticlEGammaSuperClusterProducer_cfi import ticlEGammaSuperClusterProducer -from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn -from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl -#HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) +_HgcalLocalRecoUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters) +_HgcalTICLPatternRecognitionUnseededSequence = cms.Sequence(hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh) +_SuperclusteringUnseededSequence = cms.Sequence(hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) + +# The baseline sequence +HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(_HgcalLocalRecoUnseededSequence + _HgcalTICLPatternRecognitionUnseededSequence + _SuperclusteringUnseededSequence) + +# Alpaka +from Configuration.ProcessModifiers.alpaka_cff import alpaka +alpaka.toReplaceWith(_HgcalLocalRecoUnseededSequence, + cms.Sequence( + hltHgcalDigis + + hltHGCalUncalibRecHit + + hltHGCalRecHit+hltParticleFlowRecHitHGC + + hltHgcalSoARecHitsProducer + + hltHgcalSoARecHitsLayerClustersProducer + + hltHgcalSoALayerClustersProducer + + hltHgCalLayerClustersFromSoAProducer + + hltHgcalLayerClustersHSci + + hltHgcalLayerClustersHSi + + hltHgcalMergeLayerClusters + ) + ) +alpaka.toModify(hltHgcalMergeLayerClusters, + layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) + -# Enable EGammaSuperClusterProducer at HLT in ticl v5 +# Use EGammaSuperClusterProducer at HLT in ticl v5 hltTiclTracksterLinksSuperclusteringDNNUnseeded = hltTiclTracksterLinksUnseeded.clone( linkingPSet = cms.PSet( type=cms.string("SuperClusteringDNN"), @@ -45,72 +67,88 @@ tracksters_collections = [cms.InputTag("hltTiclTrackstersCLUE3DHigh")], # to be changed to ticlTrackstersCLUE3DEM once separate CLUE3D iterations are introduced ) +from RecoHGCal.TICL.ticlEGammaSuperClusterProducer_cfi import ticlEGammaSuperClusterProducer hltTiclEGammaSuperClusterProducerUnseeded = ticlEGammaSuperClusterProducer.clone() -# All the sequences that will be used -_HgcalLocalRecoUnseededSequence = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters) -_HgcalTrackstersUnseededSequence = cms.Sequence(hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh) -_SuperclusteringUnseededSequence = cms.Sequence(hltParticleFlowClusterHGCalFromTICLUnseeded+hltParticleFlowSuperClusterHGCalFromTICLUnseeded) -_HgcalLocalRecoUnseededSequence_heterogeneous = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltParticleFlowRecHitHGC+hltHgcalSoARecHitsProducer+hltHgcalSoARecHitsLayerClustersProducer+hltHgcalSoALayerClustersProducer+hltHgCalLayerClustersFromSoAProducer+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters) -_SuperclusteringUnseededSequence_ticlv5_DNN = cms.Sequence(hltTiclTracksterLinksSuperclusteringDNNUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) -_SuperclusteringUnseededSequence_ticlv5_mustache = cms.Sequence(hltTiclTracksterLinksSuperclusteringMustacheUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) - -# The baseline sequence -HLTHgcalTiclPFClusteringForEgammaUnseededSequence = cms.Sequence(_HgcalLocalRecoUnseededSequence + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence) - -# The alpaka sequence -HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous = cms.Sequence(_HgcalLocalRecoUnseededSequence_heterogeneous + _SuperclusteringUnseededSequence + _SuperclusteringUnseededSequence) - -from Configuration.ProcessModifiers.alpaka_cff import alpaka -alpaka.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_heterogeneous) -alpaka.toModify(hltHgcalMergeLayerClusters, - layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) - -# The ticlv5 sequences -HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN = cms.Sequence(_HgcalLocalRecoUnseededSequence + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence_ticlv5_DNN) - -HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache = cms.Sequence(_HgcalLocalRecoUnseededSequence + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence_ticlv5_mustache) - -#HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltTiclTracksterLinksSuperclusteringDNNUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) - -#HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache = cms.Sequence(hltHgcalDigis+hltHGCalUncalibRecHit+hltHGCalRecHit+hltHgcalLayerClustersEE+hltHgcalLayerClustersHSci+hltHgcalLayerClustersHSi+hltHgcalMergeLayerClusters+hltFilteredLayerClustersCLUE3DHigh+hltTiclSeedingGlobal+hltTiclLayerTileProducer+hltTiclTrackstersCLUE3DHigh+hltTiclTracksterLinksSuperclusteringMustacheUnseeded+hltTiclEGammaSuperClusterProducerUnseeded) - -# DNN -ticl_superclustering_dnn.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN) -ticl_superclustering_dnn.toModify(hltTiclEGammaSuperClusterProducerUnseeded, +from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn +ticl_superclustering_dnn.toReplaceWith(_SuperclusteringUnseededSequence, + cms.Sequence( + hltTiclTracksterLinksSuperclusteringDNNUnseeded + + hltTiclEGammaSuperClusterProducerUnseeded + ) +) +ticl_superclustering_dnn.toModify(hltTiclEGammaSuperClusterProducerUnseeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNUnseeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) -# Mustache -ticl_superclustering_mustache_ticl.toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache) +# Ticl mustache +from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl +ticl_superclustering_mustache_ticl.toReplaceWith(_SuperclusteringUnseededSequence, + cms.Sequence( + hltTiclTracksterLinksSuperclusteringMustacheUnseeded + + hltTiclEGammaSuperClusterProducerUnseeded + ) +) ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerUnseeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) -# ticlv5 heterogeneous -HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN_heterogeneous = cms.Sequence(_HgcalLocalRecoUnseededSequence_heterogeneous + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence_ticlv5_DNN) - -HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache_heterogeneous = cms.Sequence(_HgcalLocalRecoUnseededSequence_heterogeneous + _HgcalTrackstersUnseededSequence + _SuperclusteringUnseededSequence_ticlv5_mustache) - -# alpaka & DNN -(alpaka & ticl_superclustering_dnn).toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_DNN_heterogeneous) +# Alpaka & DNN +(alpaka & ticl_superclustering_dnn).toReplaceWith(_HgcalLocalRecoUnseededSequence, + cms.Sequence( + hltHgcalDigis + + hltHGCalUncalibRecHit + + hltHGCalRecHit+hltParticleFlowRecHitHGC + + hltHgcalSoARecHitsProducer + + hltHgcalSoARecHitsLayerClustersProducer + + hltHgcalSoALayerClustersProducer + + hltHgCalLayerClustersFromSoAProducer + + hltHgcalLayerClustersHSci + + hltHgcalLayerClustersHSi + + hltHgcalMergeLayerClusters + ) +) +(alpaka & ticl_superclustering_dnn).toModify(hltHgcalMergeLayerClusters, + layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) +(alpaka & ticl_superclustering_dnn).toReplaceWith(_SuperclusteringUnseededSequence, + cms.Sequence( + hltTiclTracksterLinksSuperclusteringDNNUnseeded + + hltTiclEGammaSuperClusterProducerUnseeded + ) +) (alpaka & ticl_superclustering_dnn).toModify(hltTiclEGammaSuperClusterProducerUnseeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNUnseeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) -(alpaka & ticl_superclustering_dnn).toModify(hltHgcalMergeLayerClusters, - layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) -# alpaka & mustache -(alpaka & ticl_superclustering_mustache_ticl).toReplaceWith(HLTHgcalTiclPFClusteringForEgammaUnseededSequence, HLTHgcalTiclPFClusteringForEgammaUnseededSequence_ticlv5_mustache_heterogeneous) +# Alpaka & ticl mustache +(alpaka & ticl_superclustering_mustache_ticl).toReplaceWith(_HgcalLocalRecoUnseededSequence, + cms.Sequence( + hltHgcalDigis + + hltHGCalUncalibRecHit + + hltHGCalRecHit+hltParticleFlowRecHitHGC + + hltHgcalSoARecHitsProducer + + hltHgcalSoARecHitsLayerClustersProducer + + hltHgcalSoALayerClustersProducer + + hltHgCalLayerClustersFromSoAProducer + + hltHgcalLayerClustersHSci + + hltHgcalLayerClustersHSi + + hltHgcalMergeLayerClusters + ) +) +(alpaka & ticl_superclustering_mustache_ticl).toModify(hltHgcalMergeLayerClusters, + layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) +(alpaka & ticl_superclustering_mustache_ticl).toReplaceWith(_SuperclusteringUnseededSequence, + cms.Sequence( + hltTiclTracksterLinksSuperclusteringMustacheUnseeded + + hltTiclEGammaSuperClusterProducerUnseeded + ) +) (alpaka & ticl_superclustering_mustache_ticl).toModify(hltTiclEGammaSuperClusterProducerUnseeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) -(alpaka & ticl_superclustering_mustache_ticl).toModify(hltHgcalMergeLayerClusters, - layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) \ No newline at end of file + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) \ No newline at end of file From 70decc71cfcb36642e4d559ebd969c8011be1b24 Mon Sep 17 00:00:00 2001 From: rselvati Date: Tue, 17 Sep 2024 15:15:19 +0200 Subject: [PATCH 06/10] Remove useless modifiers --- .../hltEgammaCandidatesL1Seeded_cfi.py | 2 +- .../hltEgammaCandidatesUnseeded_cfi.py | 2 +- .../hltTiclTracksterLinksL1Seeded_cfi.py | 2 +- .../hltTiclTracksterLinksUnseeded_cfi.py | 2 +- ...ClusteringForEgammaL1SeededSequence_cfi.py | 2 +- ...ClusteringForEgammaUnseededSequence_cfi.py | 58 ------------------- 6 files changed, 5 insertions(+), 63 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py index 3dbbe586baac5..4fe5fabfebf1d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesL1Seeded_cfi.py @@ -7,4 +7,4 @@ ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(hltEgammaCandidatesL1Seeded, scIslandEndcapProducer = cms.InputTag("hltTiclEGammaSuperClusterProducerL1Seeded")) \ No newline at end of file +ticl_v5.toModify(hltEgammaCandidatesL1Seeded, scIslandEndcapProducer = cms.InputTag("hltTiclEGammaSuperClusterProducerL1Seeded")) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py index 60e95bc3ac9ab..8b2cb266a7816 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltEgammaCandidatesUnseeded_cfi.py @@ -7,4 +7,4 @@ ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(hltEgammaCandidatesUnseeded, scIslandEndcapProducer = cms.InputTag("hltTiclEGammaSuperClusterProducerUnseeded")) \ No newline at end of file +ticl_v5.toModify(hltEgammaCandidatesUnseeded, scIslandEndcapProducer = cms.InputTag("hltTiclEGammaSuperClusterProducerUnseeded")) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py index 610d4f68fce97..7e4915a569d05 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py @@ -31,4 +31,4 @@ regressionAndPid = cms.bool(True), tfDnnLabel = cms.string('tracksterSelectionTf'), tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHighL1Seeded", "hltTiclTrackstersPassthrough") -) \ No newline at end of file +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py index 88dd166dd9559..e0ef437ad3c58 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py @@ -31,4 +31,4 @@ regressionAndPid = cms.bool(True), tfDnnLabel = cms.string('tracksterSelectionTf'), tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersPassthrough") -) \ No newline at end of file +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py index 06653b3bcdd99..79dd9348771a2 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py @@ -73,4 +73,4 @@ ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheL1Seeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded") - ) \ No newline at end of file + ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py index 7f99bbff6d5af..28050645df0d3 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py @@ -94,61 +94,3 @@ ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) - -# Alpaka & DNN -(alpaka & ticl_superclustering_dnn).toReplaceWith(_HgcalLocalRecoUnseededSequence, - cms.Sequence( - hltHgcalDigis - + hltHGCalUncalibRecHit - + hltHGCalRecHit+hltParticleFlowRecHitHGC - + hltHgcalSoARecHitsProducer - + hltHgcalSoARecHitsLayerClustersProducer - + hltHgcalSoALayerClustersProducer - + hltHgCalLayerClustersFromSoAProducer - + hltHgcalLayerClustersHSci - + hltHgcalLayerClustersHSi - + hltHgcalMergeLayerClusters - ) -) -(alpaka & ticl_superclustering_dnn).toModify(hltHgcalMergeLayerClusters, - layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) -(alpaka & ticl_superclustering_dnn).toReplaceWith(_SuperclusteringUnseededSequence, - cms.Sequence( - hltTiclTracksterLinksSuperclusteringDNNUnseeded - + hltTiclEGammaSuperClusterProducerUnseeded - ) -) -(alpaka & ticl_superclustering_dnn).toModify(hltTiclEGammaSuperClusterProducerUnseeded, - ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNUnseeded"), - ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) - -# Alpaka & ticl mustache -(alpaka & ticl_superclustering_mustache_ticl).toReplaceWith(_HgcalLocalRecoUnseededSequence, - cms.Sequence( - hltHgcalDigis - + hltHGCalUncalibRecHit - + hltHGCalRecHit+hltParticleFlowRecHitHGC - + hltHgcalSoARecHitsProducer - + hltHgcalSoARecHitsLayerClustersProducer - + hltHgcalSoALayerClustersProducer - + hltHgCalLayerClustersFromSoAProducer - + hltHgcalLayerClustersHSci - + hltHgcalLayerClustersHSi - + hltHgcalMergeLayerClusters - ) -) -(alpaka & ticl_superclustering_mustache_ticl).toModify(hltHgcalMergeLayerClusters, - layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) -(alpaka & ticl_superclustering_mustache_ticl).toReplaceWith(_SuperclusteringUnseededSequence, - cms.Sequence( - hltTiclTracksterLinksSuperclusteringMustacheUnseeded - + hltTiclEGammaSuperClusterProducerUnseeded - ) -) -(alpaka & ticl_superclustering_mustache_ticl).toModify(hltTiclEGammaSuperClusterProducerUnseeded, - ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), - ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) \ No newline at end of file From 45cfb0a70c9ac61f198f74f622a07612a304a115 Mon Sep 17 00:00:00 2001 From: rselvati Date: Fri, 27 Sep 2024 17:57:37 +0200 Subject: [PATCH 07/10] fix ticl_v5_mustache at HLT --- ...hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py | 3 +- .../hltTiclTrackstersCLUE3DHigh_cfi.py | 2 +- .../HLTEle5OpenUnseededSequence_cfi.py | 43 +++++++++++++++- ...ClusteringForEgammaL1SeededSequence_cfi.py | 25 +++++----- ...ClusteringForEgammaUnseededSequence_cfi.py | 50 ++++++++++--------- 5 files changed, 84 insertions(+), 39 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py index 4a5bd170978a7..d80ca3f071ed7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHighL1Seeded_cfi.py @@ -141,5 +141,6 @@ ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(hltTiclTrackstersCLUE3DHighL1Seeded.pluginPatternRecognitionByCLUE3D, computeLocalTime = cms.bool(True), doPidCut = cms.bool(False)) +ticl_v5.toModify(hltTiclTrackstersCLUE3DHighL1Seeded.pluginPatternRecognitionByCLUE3D, computeLocalTime = cms.bool(True)) ticl_v5.toModify(hltTiclTrackstersCLUE3DHighL1Seeded.inferenceAlgo, type = cms.string('TracksterInferenceByDNN')) + diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHigh_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHigh_cfi.py index 88b4cd7b7ab84..ee7df1e8e3edf 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHigh_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTrackstersCLUE3DHigh_cfi.py @@ -142,5 +142,5 @@ ) from Configuration.ProcessModifiers.ticl_v5_cff import ticl_v5 -ticl_v5.toModify(hltTiclTrackstersCLUE3DHigh.pluginPatternRecognitionByCLUE3D, computeLocalTime = cms.bool(True), doPidCut = cms.bool(False)) +ticl_v5.toModify(hltTiclTrackstersCLUE3DHigh.pluginPatternRecognitionByCLUE3D, computeLocalTime = cms.bool(True)) ticl_v5.toModify(hltTiclTrackstersCLUE3DHigh.inferenceAlgo, type = cms.string('TracksterInferenceByDNN')) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenUnseededSequence_cfi.py index 12597809c4a3a..2fe7599bc9a77 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTEle5OpenUnseededSequence_cfi.py @@ -43,4 +43,45 @@ from ..sequences.HLTPFHcalClusteringForEgammaSequence_cfi import * from ..sequences.HLTTrackingV61Sequence_cfi import * -HLTEle5OpenUnseededSequence = cms.Sequence(HLTL1Sequence+HLTDoFullUnpackingEgammaEcalSequence+HLTEGammaDoLocalHcalSequence+HLTPFClusteringForEgammaUnseededSequence+HLTHgcalTiclPFClusteringForEgammaUnseededSequence+HLTFastJetForEgammaSequence+HLTPFHcalClusteringForEgammaSequence+HLTElePixelMatchUnseededSequence+HLTTrackingV61Sequence+HLTGsfElectronUnseededSequence+(hltEgammaCandidatesUnseeded+hltEgammaClusterShapeUnseeded+hltEgammaR9Unseeded+hltEgammaHGCALIDVarsUnseeded+hltEgammaHoverEUnseeded+hltEgammaEcalPFClusterIsoUnseeded+hltEgammaHGCalLayerClusterIsoUnseeded+hltEgammaHcalPFClusterIsoUnseeded+hltEgammaEleGsfTrackIsoUnseeded+hltEgammaEleGsfTrackIsoV6Unseeded+hltEgammaEleL1TrkIsoUnseeded+hltEgammaHollowTrackIsoUnseeded)+hltEgammaCandidatesWrapperUnseeded+hltEG5EtUnseededFilter+hltEle5DphiUnseededFilter+cms.ignore(hltEle5WPTightClusterShapeUnseededFilter)+cms.ignore(hltEle5WPTightClusterShapeSigmavvUnseededFilter)+cms.ignore(hltEle5WPTightClusterShapeSigmawwUnseededFilter)+cms.ignore(hltEle5WPTightHgcalHEUnseededFilter)+cms.ignore(hltEle5WPTightHEUnseededFilter)+cms.ignore(hltEle5WPTightEcalIsoUnseededFilter)+cms.ignore(hltEle5WPTightHgcalIsoUnseededFilter)+cms.ignore(hltEle5WPTightHcalIsoUnseededFilter)+cms.ignore(hltEle5WPTightPixelMatchUnseededFilter)+cms.ignore(hltEle5WPTightPMS2UnseededFilter)+cms.ignore(hltEle5WPTightGsfOneOEMinusOneOPUnseededFilter)+cms.ignore(hltEle5WPTightGsfDetaUnseededFilter)+cms.ignore(hltEle5WPTightGsfDphiUnseededFilter)+cms.ignore(hltEle5WPTightBestGsfNLayerITUnseededFilter)+cms.ignore(hltEle5WPTightBestGsfChi2UnseededFilter)+cms.ignore(hltEle5WPTightGsfTrackIsoFromL1TracksUnseededFilter)+cms.ignore(hltEle5WPTightGsfTrackIsoUnseededFilter)) +HLTEle5OpenUnseededSequence = cms.Sequence(HLTL1Sequence + +HLTDoFullUnpackingEgammaEcalSequence + +HLTEGammaDoLocalHcalSequence + +HLTPFClusteringForEgammaUnseededSequence + +HLTHgcalTiclPFClusteringForEgammaUnseededSequence + +HLTFastJetForEgammaSequence + +HLTPFHcalClusteringForEgammaSequence + +HLTElePixelMatchUnseededSequence + +HLTTrackingV61Sequence + +HLTGsfElectronUnseededSequence + +hltEgammaCandidatesUnseeded + +hltEgammaClusterShapeUnseeded + +hltEgammaR9Unseeded + +hltEgammaHGCALIDVarsUnseeded + +hltEgammaHoverEUnseeded + +hltEgammaEcalPFClusterIsoUnseeded + +hltEgammaHGCalLayerClusterIsoUnseeded + +hltEgammaHcalPFClusterIsoUnseeded + +hltEgammaEleGsfTrackIsoUnseeded + +hltEgammaEleGsfTrackIsoV6Unseeded + +hltEgammaEleL1TrkIsoUnseeded + +hltEgammaHollowTrackIsoUnseeded + +hltEgammaCandidatesWrapperUnseeded + +hltEG5EtUnseededFilter + +hltEle5DphiUnseededFilter + +cms.ignore(hltEle5WPTightClusterShapeUnseededFilter) + +cms.ignore(hltEle5WPTightClusterShapeSigmavvUnseededFilter) + +cms.ignore(hltEle5WPTightClusterShapeSigmawwUnseededFilter) + +cms.ignore(hltEle5WPTightHgcalHEUnseededFilter) + +cms.ignore(hltEle5WPTightHEUnseededFilter) + +cms.ignore(hltEle5WPTightEcalIsoUnseededFilter) + +cms.ignore(hltEle5WPTightHgcalIsoUnseededFilter) + +cms.ignore(hltEle5WPTightHcalIsoUnseededFilter) + +cms.ignore(hltEle5WPTightPixelMatchUnseededFilter) + +cms.ignore(hltEle5WPTightPMS2UnseededFilter) + +cms.ignore(hltEle5WPTightGsfOneOEMinusOneOPUnseededFilter) + +cms.ignore(hltEle5WPTightGsfDetaUnseededFilter) + +cms.ignore(hltEle5WPTightGsfDphiUnseededFilter) + +cms.ignore(hltEle5WPTightBestGsfNLayerITUnseededFilter) + +cms.ignore(hltEle5WPTightBestGsfChi2UnseededFilter) + +cms.ignore(hltEle5WPTightGsfTrackIsoFromL1TracksUnseededFilter) + +cms.ignore(hltEle5WPTightGsfTrackIsoUnseededFilter)) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py index 79dd9348771a2..9492908640540 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py @@ -52,25 +52,26 @@ from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn ticl_superclustering_dnn.toReplaceWith(_SuperclusteringUnseededSequence, cms.Sequence( - hltTiclTracksterLinksSuperclusteringDNNL1Seeded - + hltTiclEGammaSuperClusterProducerL1Seeded - ) + hltTiclTracksterLinksSuperclusteringDNNL1Seeded + + hltTiclEGammaSuperClusterProducerL1Seeded + ) ) ticl_superclustering_dnn.toModify(hltTiclEGammaSuperClusterProducerL1Seeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNL1Seeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded")) + layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded") +) # Mustache from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl ticl_superclustering_mustache_ticl.toReplaceWith(_SuperclusteringUnseededSequence, - cms.Sequence( - hltTiclTracksterLinksSuperclusteringMustacheL1Seeded - + hltTiclEGammaSuperClusterProducerL1Seeded - ) + cms.Sequence( + hltTiclTracksterLinksSuperclusteringMustacheL1Seeded + + hltTiclEGammaSuperClusterProducerL1Seeded + ) ) ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerL1Seeded, - ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheL1Seeded"), - ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded") - ) + ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheL1Seeded"), + ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), + layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py index 28050645df0d3..2105fd6f13fee 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py @@ -30,23 +30,23 @@ # Alpaka from Configuration.ProcessModifiers.alpaka_cff import alpaka alpaka.toReplaceWith(_HgcalLocalRecoUnseededSequence, - cms.Sequence( - hltHgcalDigis - + hltHGCalUncalibRecHit - + hltHGCalRecHit+hltParticleFlowRecHitHGC - + hltHgcalSoARecHitsProducer - + hltHgcalSoARecHitsLayerClustersProducer - + hltHgcalSoALayerClustersProducer - + hltHgCalLayerClustersFromSoAProducer - + hltHgcalLayerClustersHSci - + hltHgcalLayerClustersHSi - + hltHgcalMergeLayerClusters - ) - ) + cms.Sequence( + hltHgcalDigis + + hltHGCalUncalibRecHit + + hltHGCalRecHit+hltParticleFlowRecHitHGC + + hltHgcalSoARecHitsProducer + + hltHgcalSoARecHitsLayerClustersProducer + + hltHgcalSoALayerClustersProducer + + hltHgCalLayerClustersFromSoAProducer + + hltHgcalLayerClustersHSci + + hltHgcalLayerClustersHSi + + hltHgcalMergeLayerClusters + ) +) alpaka.toModify(hltHgcalMergeLayerClusters, layerClustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer"), - time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster")) - + time_layerclustersEE = cms.InputTag("hltHgCalLayerClustersFromSoAProducer", "timeLayerCluster") +) # Use EGammaSuperClusterProducer at HLT in ticl v5 hltTiclTracksterLinksSuperclusteringDNNUnseeded = hltTiclTracksterLinksUnseeded.clone( @@ -73,24 +73,26 @@ from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn ticl_superclustering_dnn.toReplaceWith(_SuperclusteringUnseededSequence, cms.Sequence( - hltTiclTracksterLinksSuperclusteringDNNUnseeded - + hltTiclEGammaSuperClusterProducerUnseeded - ) + hltTiclTracksterLinksSuperclusteringDNNUnseeded + + hltTiclEGammaSuperClusterProducerUnseeded + ) ) ticl_superclustering_dnn.toModify(hltTiclEGammaSuperClusterProducerUnseeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringDNNUnseeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters") +) # Ticl mustache from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl ticl_superclustering_mustache_ticl.toReplaceWith(_SuperclusteringUnseededSequence, - cms.Sequence( - hltTiclTracksterLinksSuperclusteringMustacheUnseeded - + hltTiclEGammaSuperClusterProducerUnseeded - ) + cms.Sequence( + hltTiclTracksterLinksSuperclusteringMustacheUnseeded + + hltTiclEGammaSuperClusterProducerUnseeded + ) ) ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerUnseeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClusters")) + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters") +) From 06e165d9f2881d32df3f267773753da4344132e8 Mon Sep 17 00:00:00 2001 From: rselvati Date: Fri, 27 Sep 2024 21:59:18 +0200 Subject: [PATCH 08/10] update configs --- .../hltTiclTracksterLinksL1Seeded_cfi.py | 24 +++++++++++++------ .../hltTiclTracksterLinksUnseeded_cfi.py | 24 +++++++++++++------ 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py index 7e4915a569d05..d4b4940ea7f05 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksL1Seeded_cfi.py @@ -2,14 +2,9 @@ hltTiclTracksterLinksL1Seeded = cms.EDProducer("TracksterLinksProducer", detector = cms.string('HGCAL'), - eid_input_name = cms.string('input'), - eid_min_cluster_energy = cms.double(2.5), - eid_n_clusters = cms.int32(10), - eid_n_layers = cms.int32(50), - eid_output_name_energy = cms.string('output/regressed_energy'), - eid_output_name_id = cms.string('output/id_probabilities'), layer_clusters = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), layer_clustersTime = cms.InputTag("hltHgcalMergeLayerClustersL1Seeded","timeLayerCluster"), + inferenceAlgo = cms.string('TracksterInferenceByDNN'), linkingPSet = cms.PSet( algo_verbosity = cms.int32(0), cylinder_radius_sqr = cms.vdouble(9, 9), @@ -25,10 +20,25 @@ type = cms.string('Skeletons'), wind = cms.double(0.036) ), + pluginInferenceAlgoTracksterInferenceByDNN = cms.PSet( + algo_verbosity = cms.int32(0), + onnxPIDModelPath = cms.FileInPath('RecoHGCal/TICL/data/ticlv5/onnx_models/linking/id_v0.onnx'), + onnxEnergyModelPath = cms.FileInPath('RecoHGCal/TICL/data/ticlv5/onnx_models/linking/energy_v0.onnx'), + inputNames = cms.vstring('input'), + output_en = cms.vstring('enreg_output'), + output_id = cms.vstring('pid_output'), + eid_min_cluster_energy = cms.double(1), + eid_n_layers = cms.int32(50), + eid_n_clusters = cms.int32(10), + doPID = cms.int32(1), + doRegression = cms.int32(1), + type = cms.string('TracksterInferenceByDNN') + ), mightGet = cms.optional.untracked.vstring, original_masks = cms.VInputTag("hltHgcalMergeLayerClustersL1Seeded:InitialLayerClustersMask"), propagator = cms.string('PropagatorWithMaterial'), regressionAndPid = cms.bool(True), - tfDnnLabel = cms.string('tracksterSelectionTf'), tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHighL1Seeded", "hltTiclTrackstersPassthrough") ) + + diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py index e0ef437ad3c58..4d90a837a4a48 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTiclTracksterLinksUnseeded_cfi.py @@ -2,14 +2,9 @@ hltTiclTracksterLinksUnseeded = cms.EDProducer("TracksterLinksProducer", detector = cms.string('HGCAL'), - eid_input_name = cms.string('input'), - eid_min_cluster_energy = cms.double(2.5), - eid_n_clusters = cms.int32(10), - eid_n_layers = cms.int32(50), - eid_output_name_energy = cms.string('output/regressed_energy'), - eid_output_name_id = cms.string('output/id_probabilities'), layer_clusters = cms.InputTag("hltHgcalMergeLayerClusters"), layer_clustersTime = cms.InputTag("hltHgcalMergeLayerClusters","timeLayerCluster"), + inferenceAlgo = cms.string('TracksterInferenceByDNN'), linkingPSet = cms.PSet( algo_verbosity = cms.int32(0), cylinder_radius_sqr = cms.vdouble(9, 9), @@ -25,10 +20,25 @@ type = cms.string('Skeletons'), wind = cms.double(0.036) ), + pluginInferenceAlgoTracksterInferenceByDNN = cms.PSet( + algo_verbosity = cms.int32(0), + onnxPIDModelPath = cms.FileInPath('RecoHGCal/TICL/data/ticlv5/onnx_models/linking/id_v0.onnx'), + onnxEnergyModelPath = cms.FileInPath('RecoHGCal/TICL/data/ticlv5/onnx_models/linking/energy_v0.onnx'), + inputNames = cms.vstring('input'), + output_en = cms.vstring('enreg_output'), + output_id = cms.vstring('pid_output'), + eid_min_cluster_energy = cms.double(1), + eid_n_layers = cms.int32(50), + eid_n_clusters = cms.int32(10), + doPID = cms.int32(1), + doRegression = cms.int32(1), + type = cms.string('TracksterInferenceByDNN') + ), mightGet = cms.optional.untracked.vstring, original_masks = cms.VInputTag("hltHgcalMergeLayerClusters:InitialLayerClustersMask"), propagator = cms.string('PropagatorWithMaterial'), regressionAndPid = cms.bool(True), - tfDnnLabel = cms.string('tracksterSelectionTf'), tracksters_collections = cms.VInputTag("hltTiclTrackstersCLUE3DHigh", "hltTiclTrackstersPassthrough") ) + + From fe606281eafe348f85919b71be2f4561ce9b8916 Mon Sep 17 00:00:00 2001 From: rselvati Date: Tue, 8 Oct 2024 17:44:42 +0200 Subject: [PATCH 09/10] disable mustache supercluster regression --- .../HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py | 3 ++- .../HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py | 3 ++- RecoHGCal/TICL/python/superclustering_cff.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py index 9492908640540..f9fa76e643388 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py @@ -73,5 +73,6 @@ ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerL1Seeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheL1Seeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHighL1Seeded"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded") + layerClusters=cms.InputTag("hltHgcalMergeLayerClustersL1Seeded"), + enableRegression=cms.bool(False) ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py index 2105fd6f13fee..f79c08e8721e9 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaUnseededSequence_cfi.py @@ -94,5 +94,6 @@ ticl_superclustering_mustache_ticl.toModify(hltTiclEGammaSuperClusterProducerUnseeded, ticlSuperClusters=cms.InputTag("hltTiclTracksterLinksSuperclusteringMustacheUnseeded"), ticlTrackstersEM=cms.InputTag("hltTiclTrackstersCLUE3DHigh"), - layerClusters=cms.InputTag("hltHgcalMergeLayerClusters") + layerClusters=cms.InputTag("hltHgcalMergeLayerClusters"), + enableRegression=cms.bool(False) ) diff --git a/RecoHGCal/TICL/python/superclustering_cff.py b/RecoHGCal/TICL/python/superclustering_cff.py index 6f6bce1c143d2..6f561223fd808 100644 --- a/RecoHGCal/TICL/python/superclustering_cff.py +++ b/RecoHGCal/TICL/python/superclustering_cff.py @@ -39,7 +39,9 @@ # Mustache-TICL _mustache_ticl_task = cms.Task(ticlTracksterLinksSuperclusteringMustache) ticl_superclustering_mustache_ticl.toReplaceWith(ticlSuperclusteringTask, _mustache_ticl_task) -ticl_superclustering_mustache_ticl.toModify(ticlEGammaSuperClusterProducer, ticlSuperClusters=cms.InputTag("ticlTracksterLinksSuperclusteringMustache")) +ticl_superclustering_mustache_ticl.toModify(ticlEGammaSuperClusterProducer, + ticlSuperClusters=cms.InputTag("ticlTracksterLinksSuperclusteringMustache"), + enableRegression=cms.bool(False)) ticl_superclustering_mustache_ticl.toReplaceWith(particleFlowSuperClusterHGCal, ticlEGammaSuperClusterProducer) # Mustache-PF From 013641436d50079a113d3021140407f1a21d5b26 Mon Sep 17 00:00:00 2001 From: rselvati Date: Tue, 8 Oct 2024 21:32:56 +0200 Subject: [PATCH 10/10] fix inappropiate name in L1Seeded sequence --- ...THgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py index f9fa76e643388..c0efe665b8c28 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHgcalTiclPFClusteringForEgammaL1SeededSequence_cfi.py @@ -21,10 +21,10 @@ _HgcalLocalRecoL1SeededSequence = cms.Sequence(hltHgcalDigis+hltL1TEGammaHGCFilteredCollectionProducer+hltHgcalDigisL1Seeded+hltHGCalUncalibRecHitL1Seeded+hltHGCalRecHitL1Seeded+hltParticleFlowRecHitHGCL1Seeded+hltRechitInRegionsHGCAL+hltHgcalLayerClustersEEL1Seeded+hltHgcalLayerClustersHSciL1Seeded+hltHgcalLayerClustersHSiL1Seeded+hltHgcalMergeLayerClustersL1Seeded) _HgcalTICLPatternRecognitionL1SeededSequence = cms.Sequence(hltFilteredLayerClustersCLUE3DHighL1Seeded+hltTiclSeedingL1+hltTiclLayerTileProducerL1Seeded+hltTiclTrackstersCLUE3DHighL1Seeded) -_SuperclusteringUnseededSequence = cms.Sequence(hltParticleFlowClusterHGCalFromTICLL1Seeded+hltParticleFlowSuperClusterHGCalFromTICLL1Seeded) +_SuperclusteringL1SeededSequence = cms.Sequence(hltParticleFlowClusterHGCalFromTICLL1Seeded+hltParticleFlowSuperClusterHGCalFromTICLL1Seeded) # The baseline sequence -HLTHgcalTiclPFClusteringForEgammaL1SeededSequence = cms.Sequence(_HgcalLocalRecoL1SeededSequence + _HgcalTICLPatternRecognitionL1SeededSequence + _SuperclusteringUnseededSequence) +HLTHgcalTiclPFClusteringForEgammaL1SeededSequence = cms.Sequence(_HgcalLocalRecoL1SeededSequence + _HgcalTICLPatternRecognitionL1SeededSequence + _SuperclusteringL1SeededSequence) # Enable EGammaSuperClusterProducer at HLT in ticl v5 hltTiclTracksterLinksSuperclusteringDNNL1Seeded = hltTiclTracksterLinksL1Seeded.clone( @@ -50,7 +50,7 @@ # DNN from Configuration.ProcessModifiers.ticl_superclustering_dnn_cff import ticl_superclustering_dnn -ticl_superclustering_dnn.toReplaceWith(_SuperclusteringUnseededSequence, +ticl_superclustering_dnn.toReplaceWith(_SuperclusteringL1SeededSequence, cms.Sequence( hltTiclTracksterLinksSuperclusteringDNNL1Seeded + hltTiclEGammaSuperClusterProducerL1Seeded @@ -64,7 +64,7 @@ # Mustache from Configuration.ProcessModifiers.ticl_superclustering_mustache_ticl_cff import ticl_superclustering_mustache_ticl -ticl_superclustering_mustache_ticl.toReplaceWith(_SuperclusteringUnseededSequence, +ticl_superclustering_mustache_ticl.toReplaceWith(_SuperclusteringL1SeededSequence, cms.Sequence( hltTiclTracksterLinksSuperclusteringMustacheL1Seeded + hltTiclEGammaSuperClusterProducerL1Seeded