From 23245dff7e70ac39c2e4c5b5db5badd8c76eb621 Mon Sep 17 00:00:00 2001 From: Martin Grunewald Date: Mon, 5 Aug 2024 11:11:14 +0200 Subject: [PATCH] Integration of CMSHLT-3303 --- HLTrigger/Configuration/python/HLT_FULL_cff.py | 4 ++-- HLTrigger/Configuration/python/HLT_GRun_cff.py | 4 ++-- HLTrigger/Configuration/python/HLT_HIon_cff.py | 4 ++-- HLTrigger/Configuration/python/HLT_PIon_cff.py | 4 ++-- HLTrigger/Configuration/python/HLT_PRef_cff.py | 4 ++-- HLTrigger/Configuration/python/HLT_Special_cff.py | 4 ++-- HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py | 2 ++ HLTrigger/Configuration/test/OnLine_HLT_FULL.py | 5 +++-- HLTrigger/Configuration/test/OnLine_HLT_GRun.py | 5 +++-- HLTrigger/Configuration/test/OnLine_HLT_HIon.py | 4 ++-- HLTrigger/Configuration/test/OnLine_HLT_PIon.py | 4 ++-- HLTrigger/Configuration/test/OnLine_HLT_PRef.py | 5 +++-- HLTrigger/Configuration/test/OnLine_HLT_Special.py | 4 ++-- 13 files changed, 29 insertions(+), 24 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py index 2d86e7cd63490..429de9e338856 100644 --- a/HLTrigger/Configuration/python/HLT_FULL_cff.py +++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/HLT --cff --data --type FULL -# /dev/CMSSW_14_0_0/HLT/V192 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/HLT/V193 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -11,7 +11,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V192") + tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V193") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py index 29dc5efc09f10..29ce31ffe430b 100644 --- a/HLTrigger/Configuration/python/HLT_GRun_cff.py +++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/GRun --cff --data --type GRun -# /dev/CMSSW_14_0_0/GRun/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/GRun/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V172") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py index 062613e208823..6b2a9dec101a6 100644 --- a/HLTrigger/Configuration/python/HLT_HIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/HIon --cff --data --type HIon -# /dev/CMSSW_14_0_0/HIon/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/HIon/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -11,7 +11,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V172") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py index 2eb1abc7cdc65..25336afffa06e 100644 --- a/HLTrigger/Configuration/python/HLT_PIon_cff.py +++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/PIon --cff --data --type PIon -# /dev/CMSSW_14_0_0/PIon/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/PIon/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V172") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py index 29628eb16d785..f45abe4c6bed2 100644 --- a/HLTrigger/Configuration/python/HLT_PRef_cff.py +++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/PRef --cff --data --type PRef -# /dev/CMSSW_14_0_0/PRef/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/PRef/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V172") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLT_Special_cff.py b/HLTrigger/Configuration/python/HLT_Special_cff.py index 86ac8a7155dfd..02fc39bb3e122 100644 --- a/HLTrigger/Configuration/python/HLT_Special_cff.py +++ b/HLTrigger/Configuration/python/HLT_Special_cff.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/Special --cff --data --type Special -# /dev/CMSSW_14_0_0/Special/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/Special/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ fragment.load("Configuration.StandardSequences.Accelerators_cff") fragment.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Special/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/Special/V172") ) fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( diff --git a/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py b/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py index 0fd1092b43bf3..cc7135c26d0a1 100644 --- a/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py +++ b/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py @@ -126,6 +126,7 @@ 'keep *_hltIsolPixelTrackProdHE_*_*', 'keep *_hltIter0PFlowCtfWithMaterialTracks_*_*', 'keep *_hltIter0PFlowTrackSelectionHighPurity_*_*', + 'keep *_hltIter2MergedForDisplaced_*_*', 'keep *_hltIterL3GlbMuon_*_*', 'keep *_hltIterL3MuonAndMuonFromL1Merged_*_*', 'keep *_hltIterL3MuonMerged_*_*', @@ -287,6 +288,7 @@ 'keep *_hltIsolPixelTrackProdHE_*_*', 'keep *_hltIter0PFlowCtfWithMaterialTracks_*_*', 'keep *_hltIter0PFlowTrackSelectionHighPurity_*_*', + 'keep *_hltIter2MergedForDisplaced_*_*', 'keep *_hltIterL3GlbMuon_*_*', 'keep *_hltIterL3MuonAndMuonFromL1Merged_*_*', 'keep *_hltIterL3MuonMerged_*_*', diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index b337197d8afa7..9989094334f56 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/HLT --full --data --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root -# /dev/CMSSW_14_0_0/HLT/V192 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/HLT/V193 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -11,7 +11,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V192") + tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V193") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -116427,6 +116427,7 @@ 'keep *_hltHbhereco_*_*', 'keep *_hltHfreco_*_*', 'keep *_hltHoreco_*_*', + 'keep *_hltIter2MergedForDisplaced_*_*', 'keep *_hltMergedTracks_*_*', 'keep *_hltOnlineBeamSpot_*_*', 'keep *_hltPFJetForBtag_*_*', diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index b13cacf9b324d..c8cdad13ff110 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/GRun --full --data --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root -# /dev/CMSSW_14_0_0/GRun/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/GRun/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V172") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -88140,6 +88140,7 @@ 'keep *_hltHbhereco_*_*', 'keep *_hltHfreco_*_*', 'keep *_hltHoreco_*_*', + 'keep *_hltIter2MergedForDisplaced_*_*', 'keep *_hltMergedTracks_*_*', 'keep *_hltOnlineBeamSpot_*_*', 'keep *_hltPFJetForBtag_*_*', diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index 5c51ae1d47c24..0270194fdb934 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/HIon --full --data --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root -# /dev/CMSSW_14_0_0/HIon/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/HIon/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -11,7 +11,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V172") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index 642d508e595ca..9d5b2023e939c 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/PIon --full --data --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root -# /dev/CMSSW_14_0_0/PIon/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/PIon/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V172") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index ad0accee8cc49..fdc38ceca8ca7 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/PRef --full --data --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root -# /dev/CMSSW_14_0_0/PRef/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/PRef/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V172") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( @@ -15529,6 +15529,7 @@ 'keep *_hltHbhereco_*_*', 'keep *_hltHfreco_*_*', 'keep *_hltHoreco_*_*', + 'keep *_hltIter2MergedForDisplaced_*_*', 'keep *_hltMergedTracks_*_*', 'keep *_hltOnlineBeamSpot_*_*', 'keep *_hltPFJetForBtag_*_*', diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Special.py b/HLTrigger/Configuration/test/OnLine_HLT_Special.py index fd20cfe8029fd..2e0bfb9c32191 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Special.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Special.py @@ -1,6 +1,6 @@ # hltGetConfiguration /dev/CMSSW_14_0_0/Special --full --data --type Special --unprescale --process HLTSpecial --globaltag auto:run3_hlt_Special --input file:RelVal_Raw_Special_DATA.root -# /dev/CMSSW_14_0_0/Special/V171 (CMSSW_14_0_11) +# /dev/CMSSW_14_0_0/Special/V172 (CMSSW_14_0_11) import FWCore.ParameterSet.Config as cms @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.Accelerators_cff") process.HLTConfigVersion = cms.PSet( - tableName = cms.string("/dev/CMSSW_14_0_0/Special/V171") + tableName = cms.string("/dev/CMSSW_14_0_0/Special/V172") ) process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet(