Skip to content

Commit

Permalink
Merge pull request #38107 from cms-tsg-storm/HLTdevelopment124X_for125X
Browse files Browse the repository at this point in the history
HLT menu development for `12_4_X` [`12_5_X`]
  • Loading branch information
cmsbuild committed May 28, 2022
2 parents d5788d4 + 0ca9232 commit 328410a
Show file tree
Hide file tree
Showing 13 changed files with 8,029 additions and 502 deletions.
2,001 changes: 1,930 additions & 71 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

1,989 changes: 1,924 additions & 65 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_4_0/HIon --type HIon

# /dev/CMSSW_12_4_0/HIon/V13 (CMSSW_12_4_0_pre4)
# /dev/CMSSW_12_4_0/HIon/V22 (CMSSW_12_4_0_pre4)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,7 +12,7 @@
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_4_0/HIon/V13')
tableName = cms.string('/dev/CMSSW_12_4_0/HIon/V22')
)

fragment.transferSystem = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_4_0/PIon --type PIon

# /dev/CMSSW_12_4_0/PIon/V13 (CMSSW_12_4_0_pre4)
# /dev/CMSSW_12_4_0/PIon/V22 (CMSSW_12_4_0_pre4)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,7 +12,7 @@
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_4_0/PIon/V13')
tableName = cms.string('/dev/CMSSW_12_4_0/PIon/V22')
)

fragment.transferSystem = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_4_0/PRef --type PRef

# /dev/CMSSW_12_4_0/PRef/V13 (CMSSW_12_4_0_pre4)
# /dev/CMSSW_12_4_0/PRef/V22 (CMSSW_12_4_0_pre4)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,7 +12,7 @@
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_4_0/PRef/V13')
tableName = cms.string('/dev/CMSSW_12_4_0/PRef/V22')
)

fragment.transferSystem = cms.PSet(
Expand Down
29 changes: 28 additions & 1 deletion HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
Expand Up @@ -193,7 +193,8 @@
'MC_PFHT_v16',
'MC_PFMET_v17',
'MC_PFMHT_v16',
'MC_ReducedIterativeTracking_v12'
'MC_ReducedIterativeTracking_v12',
'MC_Run3_PFScoutingPixelTracking_v16'
)

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsCommissioning_datasetNoBPTX_selector
Expand Down Expand Up @@ -237,6 +238,17 @@
streamPhysicsEGamma_datasetEGamma_selector.throw = cms.bool(False)
streamPhysicsEGamma_datasetEGamma_selector.triggerConditions = cms.vstring(
'HLT_DiEle27_WPTightCaloOnly_L1DoubleEG_v4',
'HLT_DiPhoton10Time1ns_v1',
'HLT_DiPhoton10Time1p2ns_v1',
'HLT_DiPhoton10Time1p4ns_v1',
'HLT_DiPhoton10Time1p6ns_v1',
'HLT_DiPhoton10Time1p8ns_v1',
'HLT_DiPhoton10Time2ns_v1',
'HLT_DiPhoton10_CaloIdL_v1',
'HLT_DiPhoton10sminlt0p12_v1',
'HLT_DiPhoton10sminlt0p14_v1',
'HLT_DiPhoton10sminlt0p16_v1',
'HLT_DiPhoton10sminlt0p1_v1',
'HLT_DiSC30_18_EIso_AND_HE_Mass70_v13',
'HLT_Diphoton30PV_18PV_R9Id_AND_IsoCaloId_AND_HE_R9Id_NoPixelVeto_Mass55_v13',
'HLT_Diphoton30_18_R9IdL_AND_HE_AND_IsoCaloId_NoPixelVeto_Mass55_v2',
Expand Down Expand Up @@ -477,7 +489,20 @@
'HLT_CscCluster_Loose_v1',
'HLT_CscCluster_Medium_v1',
'HLT_CscCluster_Tight_v1',
'HLT_HT170_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v1',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay0p5nsTrackless_v1',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay1nsInclusive_v1',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay1nsTrackless_v1',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay2nsInclusive_v1',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet30_Inclusive1PtrkShortSig5_v1',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet35_Inclusive1PtrkShortSig5_v1',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v1',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet40_Inclusive1PtrkShortSig5_v1',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet60_DisplacedTrack_v1',
'HLT_HT270_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v1',
'HLT_HT320_L1SingleLLPJet_DisplacedDijet60_Inclusive_v1',
'HLT_HT400_DisplacedDijet40_DisplacedTrack_v13',
'HLT_HT420_L1SingleLLPJet_DisplacedDijet60_Inclusive_v1',
'HLT_HT425_v9',
'HLT_HT430_DelayedJet40_DoubleDelay0p5nsTrackless_v1',
'HLT_HT430_DelayedJet40_DoubleDelay1nsInclusive_v1',
Expand Down Expand Up @@ -794,6 +819,7 @@
'HLT_DoubleL2Mu30NoVtx_2Cha_CosmicSeed_Eta2p4_v2',
'HLT_DoubleL2Mu30NoVtx_2Cha_Eta2p4_v2',
'HLT_DoubleL2Mu50_v2',
'HLT_DoubleL3Iter4Mu16_10NoVtx_DxyMin0p01cm_v1',
'HLT_DoubleL3Mu16_10NoVtx_DxyMin0p01cm_v1',
'HLT_DoubleMu3_DCA_PFMET50_PFMHT60_v10',
'HLT_DoubleMu3_DZ_PFMET50_PFMHT60_v10',
Expand All @@ -803,6 +829,7 @@
'HLT_DoubleMu43NoFiltersNoVtx_v4',
'HLT_DoubleMu48NoFiltersNoVtx_v4',
'HLT_DoubleMu4_Mass3p8_DZ_PFHT350_v8',
'HLT_L3Iter4Mu10_NoVtx_DxyMin0p01cm_v1',
'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass3p8_v5',
'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass8_v5',
'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_v15',
Expand Down
27 changes: 27 additions & 0 deletions HLTrigger/Configuration/tables/GRun.txt
Expand Up @@ -715,6 +715,32 @@ HLT_PFMET105_IsoTrk50_v* # CMSHLT
HLT_PFMET105_PFJet100_looseRecoiling_v* # CMSHLT-2211
HLT_PFMET110_PFJet100_v* # CMSHLT-2211
HLT_PFMET110_PFJet100_looseRecoiling_v* # CMSHLT-2211
HLT_DoubleL3Iter4Mu16_10NoVtx_DxyMin0p01cm_v* # CMSHLT-2301
HLT_L3Iter4Mu10_NoVtx_DxyMin0p01cm_v* # CMSHLT-2301
HLT_HT170_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay0p5nsTrackless_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay1nsInclusive_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay1nsTrackless_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay2nsInclusive_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet30_Inclusive1PtrkShortSig5_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet35_Inclusive1PtrkShortSig5_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet40_Inclusive1PtrkShortSig5_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet60_DisplacedTrack_v* # CMSHLT-2280
HLT_HT270_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v* # CMSHLT-2280
HLT_HT320_L1SingleLLPJet_DisplacedDijet60_Inclusive_v* # CMSHLT-2280
HLT_HT420_L1SingleLLPJet_DisplacedDijet60_Inclusive_v* # CMSHLT-2280
HLT_DiPhoton10Time1ns_v* # CMSHLT-2280
HLT_DiPhoton10Time1p2ns_v* # CMSHLT-2280
HLT_DiPhoton10Time1p4ns_v* # CMSHLT-2280
HLT_DiPhoton10Time1p6ns_v* # CMSHLT-2280
HLT_DiPhoton10Time1p8ns_v* # CMSHLT-2280
HLT_DiPhoton10Time2ns_v* # CMSHLT-2280
HLT_DiPhoton10sminlt0p1_v* # CMSHLT-2280
HLT_DiPhoton10sminlt0p12_v* # CMSHLT-2280
HLT_DiPhoton10sminlt0p14_v* # CMSHLT-2280
HLT_DiPhoton10sminlt0p16_v* # CMSHLT-2280
HLT_DiPhoton10_CaloIdL_v* # CMSHLT-2280

HLT_L1SingleMuCosmics_v* # CMSHLT-2097

Expand Down Expand Up @@ -797,6 +823,7 @@ MC_PFBTagDeepCSV_v* # CMSHLT-1241
MC_CaloBTagDeepCSV_v* # CMSHLT-1241
MC_AK4CaloJetsFromPV_v* # CMSHLT-1241
MC_PFBTagDeepJet_v* # CMSHLT-2184
MC_Run3_PFScoutingPixelTracking_v* # CMSHLT-2302

######## paths that are different between GRun and online_grun ################################

Expand Down
26 changes: 26 additions & 0 deletions HLTrigger/Configuration/tables/online_grun.txt
Expand Up @@ -705,6 +705,32 @@ HLT_PFMET105_IsoTrk50_v* # CMSHLT
HLT_PFMET105_PFJet100_looseRecoiling_v* # CMSHLT-2211
HLT_PFMET110_PFJet100_v* # CMSHLT-2211
HLT_PFMET110_PFJet100_looseRecoiling_v* # CMSHLT-2211
HLT_DoubleL3Iter4Mu16_10NoVtx_DxyMin0p01cm_v* # CMSHLT-2301
HLT_L3Iter4Mu10_NoVtx_DxyMin0p01cm_v* # CMSHLT-2301
HLT_HT170_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay0p5nsTrackless_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay1nsInclusive_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay1nsTrackless_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay2nsInclusive_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet30_Inclusive1PtrkShortSig5_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet35_Inclusive1PtrkShortSig5_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet40_Inclusive1PtrkShortSig5_v* # CMSHLT-2280
HLT_HT200_L1SingleLLPJet_DisplacedDijet60_DisplacedTrack_v* # CMSHLT-2280
HLT_HT270_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v* # CMSHLT-2280
HLT_HT320_L1SingleLLPJet_DisplacedDijet60_Inclusive_v* # CMSHLT-2280
HLT_HT420_L1SingleLLPJet_DisplacedDijet60_Inclusive_v* # CMSHLT-2280
HLT_DiPhoton10Time1ns_v* # CMSHLT-2280
HLT_DiPhoton10Time1p2ns_v* # CMSHLT-2280
HLT_DiPhoton10Time1p4ns_v* # CMSHLT-2280
HLT_DiPhoton10Time1p6ns_v* # CMSHLT-2280
HLT_DiPhoton10Time1p8ns_v* # CMSHLT-2280
HLT_DiPhoton10Time2ns_v* # CMSHLT-2280
HLT_DiPhoton10sminlt0p1_v* # CMSHLT-2280
HLT_DiPhoton10sminlt0p12_v* # CMSHLT-2280
HLT_DiPhoton10sminlt0p14_v* # CMSHLT-2280
HLT_DiPhoton10sminlt0p16_v* # CMSHLT-2280
HLT_DiPhoton10_CaloIdL_v* # CMSHLT-2280

HLT_L1SingleMuCosmics_v* # CMSHLT-2097

Expand Down

0 comments on commit 328410a

Please sign in to comment.