Skip to content

Commit

Permalink
Merge pull request #39925 from cms-tsg-storm/HLTdevelopment124X_for125X
Browse files Browse the repository at this point in the history
HLT menu development for `12_4_X` (10/N): HLT V1.5 of 2022 [`12_5_X`]
  • Loading branch information
cmsbuild committed Nov 1, 2022
2 parents c3adae4 + 4d67e75 commit c19c2f9
Show file tree
Hide file tree
Showing 21 changed files with 25,524 additions and 60,626 deletions.
2 changes: 1 addition & 1 deletion Configuration/HLT/python/autoCondHLT.py
Expand Up @@ -21,7 +21,7 @@
'FULL' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'2022v14' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2018_v4_2_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-11-21 14:35:33.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2022_v1_1_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-10-26 10:46:29.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_pp502Collisions2017_v4_m6_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-11-03 18:00:00.000"] ), ),
}
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
Expand Up @@ -1773,7 +1773,7 @@ def lhegensim2018ml(fragment,howMuch):

steps['DIGIHI2021PPRECOAPPROXCLUSTERS']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2021_ppReco_approxClusters, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2021PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2021_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2018PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:HIon'}, hiDefaults2018_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2018PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2018_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2018']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2018, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
steps['DIGIHI2017']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2017, step2Upg2015Defaults])
steps['DIGIHI2015']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2015, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
Expand Down
12,225 changes: 1,903 additions & 10,322 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

504 changes: 331 additions & 173 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

27,452 changes: 9,624 additions & 17,828 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py

Large diffs are not rendered by default.

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/V145 (CMSSW_12_4_0)
# /dev/CMSSW_12_4_0/PIon/V171 (CMSSW_12_4_0)

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/V145')
tableName = cms.string('/dev/CMSSW_12_4_0/PIon/V171')
)

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/V145 (CMSSW_12_4_0)
# /dev/CMSSW_12_4_0/PRef/V171 (CMSSW_12_4_0)

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/V145')
tableName = cms.string('/dev/CMSSW_12_4_0/PRef/V171')
)

fragment.transferSystem = cms.PSet(
Expand Down
76 changes: 41 additions & 35 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
Expand Up @@ -913,7 +913,7 @@
'MC_CaloMET_v10',
'MC_CaloMHT_v10',
'MC_Diphoton10_10_R9Id_OR_IsoCaloId_AND_HE_R9Id_Mass10_v15',
'MC_DoubleEle5_CaloIdL_MW_v17',
'MC_DoubleEle5_CaloIdL_MW_v18',
'MC_DoubleMuNoFiltersNoVtx_v9',
'MC_DoubleMu_TrkIsoVVL_DZ_v13',
'MC_Ele15_Ele10_CaloIdL_TrackIdL_IsoVL_DZ_v17',
Expand All @@ -925,7 +925,7 @@
'MC_PFMET_v19',
'MC_PFMHT_v18',
'MC_ReducedIterativeTracking_v14',
'MC_Run3_PFScoutingPixelTracking_v17'
'MC_Run3_PFScoutingPixelTracking_v18'
)

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsCommissioning_datasetNoBPTX_selector
Expand Down Expand Up @@ -989,22 +989,22 @@
'HLT_CscCluster_Loose_v2',
'HLT_CscCluster_Medium_v2',
'HLT_CscCluster_Tight_v2',
'HLT_HT170_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v2',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay0p5nsTrackless_v2',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay1nsInclusive_v2',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay1nsTrackless_v2',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay2nsInclusive_v2',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet30_Inclusive1PtrkShortSig5_v2',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet35_Inclusive1PtrkShortSig5_v2',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v2',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet40_Inclusive1PtrkShortSig5_v2',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet60_DisplacedTrack_v2',
'HLT_HT270_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v2',
'HLT_HT320_L1SingleLLPJet_DisplacedDijet60_Inclusive_v2',
'HLT_HT170_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v3',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay0p5nsTrackless_v3',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_DoubleDelay1nsInclusive_v3',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay1nsTrackless_v3',
'HLT_HT200_L1SingleLLPJet_DelayedJet40_SingleDelay2nsInclusive_v3',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet30_Inclusive1PtrkShortSig5_v3',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet35_Inclusive1PtrkShortSig5_v3',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v3',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet40_Inclusive1PtrkShortSig5_v3',
'HLT_HT200_L1SingleLLPJet_DisplacedDijet60_DisplacedTrack_v3',
'HLT_HT270_L1SingleLLPJet_DisplacedDijet40_DisplacedTrack_v3',
'HLT_HT320_L1SingleLLPJet_DisplacedDijet60_Inclusive_v3',
'HLT_HT400_DisplacedDijet40_DisplacedTrack_v15',
'HLT_HT420_L1SingleLLPJet_DisplacedDijet60_Inclusive_v2',
'HLT_HT420_L1SingleLLPJet_DisplacedDijet60_Inclusive_v3',
'HLT_HT425_v11',
'HLT_HT430_DelayedJet40_DoubleDelay0p5nsInclusive_v1',
'HLT_HT430_DelayedJet40_DoubleDelay0p5nsInclusive_v2',
'HLT_HT430_DelayedJet40_DoubleDelay0p5nsTrackless_v3',
'HLT_HT430_DelayedJet40_DoubleDelay1nsInclusive_v3',
'HLT_HT430_DelayedJet40_SingleDelay0p5nsInclusive_v1',
Expand All @@ -1026,6 +1026,12 @@
'HLT_L1MET_DTCluster50_v3',
'HLT_L1MET_DTClusterNoMB1S50_v3',
'HLT_L1Mu6HT240_v2',
'HLT_L1Tau_DelayedJet40_DoubleDelay0p5nsTrackless_v1',
'HLT_L1Tau_DelayedJet40_DoubleDelay0p75nsInclusive_v1',
'HLT_L1Tau_DelayedJet40_DoubleDelay1nsTrackless_v1',
'HLT_L1Tau_DelayedJet40_DoubleDelay1p25nsInclusive_v1',
'HLT_L1Tau_DelayedJet40_SingleDelay2p5nsTrackless_v1',
'HLT_L1Tau_DelayedJet40_SingleDelay3p5nsInclusive_v1',
'HLT_Mu6HT240_DisplacedDijet30_Inclusive0PtrkShortSig5_v3',
'HLT_Mu6HT240_DisplacedDijet30_Inclusive1PtrkShortSig5_DisplacedLoose_v3',
'HLT_Mu6HT240_DisplacedDijet35_Inclusive0PtrkShortSig5_v3',
Expand Down Expand Up @@ -1107,7 +1113,7 @@
'HLT_DiPhoton10_CaloIdL_v2',
'HLT_DiPhoton10sminlt0p12_v2',
'HLT_DiPhoton10sminlt0p1_v2',
'HLT_DiSC30_18_EIso_AND_HE_Mass70_v15',
'HLT_DiSC30_18_EIso_AND_HE_Mass70_v16',
'HLT_Diphoton20_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v2',
'HLT_Diphoton20_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v2',
'HLT_Diphoton22_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v2',
Expand All @@ -1116,18 +1122,18 @@
'HLT_Diphoton30_18_R9IdL_AND_HE_AND_IsoCaloId_v3',
'HLT_Diphoton30_22_R9Id_OR_IsoCaloId_AND_HE_R9Id_Mass90_v15',
'HLT_Diphoton30_22_R9Id_OR_IsoCaloId_AND_HE_R9Id_Mass95_v15',
'HLT_DoubleEle25_CaloIdL_MW_v6',
'HLT_DoubleEle27_CaloIdL_MW_v6',
'HLT_DoubleEle33_CaloIdL_MW_v19',
'HLT_DoubleEle25_CaloIdL_MW_v7',
'HLT_DoubleEle27_CaloIdL_MW_v7',
'HLT_DoubleEle33_CaloIdL_MW_v20',
'HLT_DoubleEle8_CaloIdM_TrackIdM_Mass8_DZ_PFHT350_v22',
'HLT_DoubleEle8_CaloIdM_TrackIdM_Mass8_PFHT350_v22',
'HLT_DoublePhoton33_CaloIdL_v8',
'HLT_DoublePhoton70_v8',
'HLT_DoublePhoton85_v16',
'HLT_DoublePhoton33_CaloIdL_v9',
'HLT_DoublePhoton70_v9',
'HLT_DoublePhoton85_v17',
'HLT_ECALHT800_v12',
'HLT_Ele115_CaloIdVT_GsfTrkIdT_v16',
'HLT_Ele115_CaloIdVT_GsfTrkIdT_v17',
'HLT_Ele12_CaloIdL_TrackIdL_IsoVL_PFJet30_v20',
'HLT_Ele135_CaloIdVT_GsfTrkIdT_v9',
'HLT_Ele135_CaloIdVT_GsfTrkIdT_v10',
'HLT_Ele15_IsoVVVL_PFHT450_CaloBTagDeepCSV_4p5_v10',
'HLT_Ele15_IsoVVVL_PFHT450_PFMET50_v18',
'HLT_Ele15_IsoVVVL_PFHT450_v18',
Expand Down Expand Up @@ -1164,19 +1170,19 @@
'HLT_Photon110EB_TightID_TightIso_v4',
'HLT_Photon120_R9Id90_HE10_IsoM_v16',
'HLT_Photon120_v15',
'HLT_Photon150_v8',
'HLT_Photon150_v9',
'HLT_Photon165_R9Id90_HE10_IsoM_v17',
'HLT_Photon175_v16',
'HLT_Photon200_v15',
'HLT_Photon175_v17',
'HLT_Photon200_v16',
'HLT_Photon20_HoverELoose_v12',
'HLT_Photon20_v4',
'HLT_Photon300_NoHE_v14',
'HLT_Photon300_NoHE_v15',
'HLT_Photon30EB_TightID_TightIso_v3',
'HLT_Photon30_HoverELoose_v12',
'HLT_Photon33_v7',
'HLT_Photon50_R9Id90_HE10_IsoM_v16',
'HLT_Photon50_v15',
'HLT_Photon60_R9Id90_CaloIdL_IsoL_DisplacedIdL_PFHT350MinPFJet15_v13',
'HLT_Photon60_R9Id90_CaloIdL_IsoL_DisplacedIdL_PFHT350MinPFJet15_v14',
'HLT_Photon75_R9Id90_HE10_IsoM_EBOnly_PFJetsMJJ300DEta3_v7',
'HLT_Photon75_R9Id90_HE10_IsoM_v16',
'HLT_Photon75_v15',
Expand All @@ -1191,7 +1197,7 @@
streamPhysicsHLTPhysics_datasetEphemeralHLTPhysics_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsHLTPhysics_datasetEphemeralHLTPhysics_selector.l1tResults = cms.InputTag('')
streamPhysicsHLTPhysics_datasetEphemeralHLTPhysics_selector.throw = cms.bool(False)
streamPhysicsHLTPhysics_datasetEphemeralHLTPhysics_selector.triggerConditions = cms.vstring('HLT_EphemeralPhysics_v2')
streamPhysicsHLTPhysics_datasetEphemeralHLTPhysics_selector.triggerConditions = cms.vstring('HLT_EphemeralPhysics_v3')


# stream PhysicsJetMET
Expand Down Expand Up @@ -1282,7 +1288,7 @@
'HLT_DoublePFJets200_PFBTagDeepCSV_p71_v3',
'HLT_DoublePFJets200_PFBTagDeepJet_p71_v3',
'HLT_DoublePFJets350_PFBTagDeepCSV_p71_v3',
'HLT_DoublePFJets350_PFBTagDeepJet_p71_v3',
'HLT_DoublePFJets350_PFBTagDeepJet_p71_v4',
'HLT_DoublePFJets40_PFBTagDeepCSV_p71_v3',
'HLT_DoublePFJets40_PFBTagDeepJet_p71_v3',
'HLT_L1ETMHadSeeds_v4',
Expand Down Expand Up @@ -1591,12 +1597,12 @@
streamPhysicsScoutingPFMonitor_datasetScoutingPFMonitor_selector.throw = cms.bool(False)
streamPhysicsScoutingPFMonitor_datasetScoutingPFMonitor_selector.triggerConditions = cms.vstring(
'DST_Run3_PFScoutingPixelTracking_v18',
'HLT_Ele115_CaloIdVT_GsfTrkIdT_v16',
'HLT_Ele115_CaloIdVT_GsfTrkIdT_v17',
'HLT_Ele35_WPTight_Gsf_v11',
'HLT_IsoMu27_v18',
'HLT_Mu50_v15',
'HLT_PFHT1050_v20',
'HLT_Photon200_v15'
'HLT_Photon200_v16'
)


Expand All @@ -1606,5 +1612,5 @@
streamPhysicsZeroBias_datasetEphemeralZeroBias_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsZeroBias_datasetEphemeralZeroBias_selector.l1tResults = cms.InputTag('')
streamPhysicsZeroBias_datasetEphemeralZeroBias_selector.throw = cms.bool(False)
streamPhysicsZeroBias_datasetEphemeralZeroBias_selector.triggerConditions = cms.vstring('HLT_EphemeralZeroBias_v2')
streamPhysicsZeroBias_datasetEphemeralZeroBias_selector.triggerConditions = cms.vstring('HLT_EphemeralZeroBias_v3')

0 comments on commit c19c2f9

Please sign in to comment.