Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HLT menu development for 12_3_X #36807

Merged
merged 1 commit into from
Jan 27, 2022
Merged

HLT menu development for 12_3_X #36807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
313 changes: 304 additions & 9 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

307 changes: 301 additions & 6 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/HIon --type HIon

# /dev/CMSSW_12_3_0/HIon/V19 (CMSSW_12_3_0_pre4)
# /dev/CMSSW_12_3_0/HIon/V23 (CMSSW_12_3_0_pre4)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V19')
tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V23')
)

fragment.transferSystem = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/PIon --type PIon

# /dev/CMSSW_12_3_0/PIon/V19 (CMSSW_12_3_0_pre4)
# /dev/CMSSW_12_3_0/PIon/V23 (CMSSW_12_3_0_pre4)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V19')
tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V23')
)

fragment.transferSystem = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/PRef --type PRef

# /dev/CMSSW_12_3_0/PRef/V19 (CMSSW_12_3_0_pre4)
# /dev/CMSSW_12_3_0/PRef/V23 (CMSSW_12_3_0_pre4)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V19')
tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V23')
)

fragment.transferSystem = cms.PSet(
Expand Down
15 changes: 15 additions & 0 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
'MC_Ele5_WPTight_Gsf_v8',
'MC_IsoMu_v15',
'MC_PFBTagDeepCSV_v10',
'MC_PFBTagDeepJet_v1',
'MC_PFHT_v16',
'MC_PFMET_v17',
'MC_PFMHT_v16',
Expand Down Expand Up @@ -563,17 +564,22 @@
'HLT_PFHT180_v17',
'HLT_PFHT250_v17',
'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepCSV_4p5_v3',
'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepJet_4p5_v1',
'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_v9',
'HLT_PFHT350MinPFJet15_v9',
'HLT_PFHT350_v19',
'HLT_PFHT370_v17',
'HLT_PFHT400_FivePFJet_100_100_60_30_30_DoublePFBTagDeepCSV_4p5_v8',
'HLT_PFHT400_FivePFJet_100_100_60_30_30_DoublePFBTagDeepJet_4p5_v1',
'HLT_PFHT400_FivePFJet_100_100_60_30_30_v8',
'HLT_PFHT400_FivePFJet_120_120_60_30_30_DoublePFBTagDeepCSV_4p5_v8',
'HLT_PFHT400_FivePFJet_120_120_60_30_30_DoublePFBTagDeepJet_4p5_v1',
'HLT_PFHT400_SixPFJet32_DoublePFBTagDeepCSV_2p94_v8',
'HLT_PFHT400_SixPFJet32_DoublePFBTagDeepJet_2p94_v1',
'HLT_PFHT400_SixPFJet32_v8',
'HLT_PFHT430_v17',
'HLT_PFHT450_SixPFJet36_PFBTagDeepCSV_1p59_v7',
'HLT_PFHT450_SixPFJet36_PFBTagDeepJet_1p59_v1',
'HLT_PFHT450_SixPFJet36_v7',
'HLT_PFHT500_PFMET100_PFMHT100_IDTight_v12',
'HLT_PFHT500_PFMET110_PFMHT110_IDTight_v12',
Expand Down Expand Up @@ -612,16 +618,24 @@
'HLT_PFJetFwd60_v19',
'HLT_PFJetFwd80_v18',
'HLT_QuadPFJet103_88_75_15_DoublePFBTagDeepCSV_1p3_7p7_VBF1_v8',
'HLT_QuadPFJet103_88_75_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v1',
'HLT_QuadPFJet103_88_75_15_PFBTagDeepCSV_1p3_VBF2_v8',
'HLT_QuadPFJet103_88_75_15_PFBTagDeepJet_1p3_VBF2_v1',
'HLT_QuadPFJet103_88_75_15_v5',
'HLT_QuadPFJet105_88_76_15_DoublePFBTagDeepCSV_1p3_7p7_VBF1_v8',
'HLT_QuadPFJet105_88_76_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v1',
'HLT_QuadPFJet105_88_76_15_PFBTagDeepCSV_1p3_VBF2_v8',
'HLT_QuadPFJet105_88_76_15_PFBTagDeepJet_1p3_VBF2_v1',
'HLT_QuadPFJet105_88_76_15_v5',
'HLT_QuadPFJet111_90_80_15_DoublePFBTagDeepCSV_1p3_7p7_VBF1_v8',
'HLT_QuadPFJet111_90_80_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v1',
'HLT_QuadPFJet111_90_80_15_PFBTagDeepCSV_1p3_VBF2_v8',
'HLT_QuadPFJet111_90_80_15_PFBTagDeepJet_1p3_VBF2_v1',
'HLT_QuadPFJet111_90_80_15_v5',
'HLT_QuadPFJet98_83_71_15_DoublePFBTagDeepCSV_1p3_7p7_VBF1_v8',
'HLT_QuadPFJet98_83_71_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v1',
'HLT_QuadPFJet98_83_71_15_PFBTagDeepCSV_1p3_VBF2_v8',
'HLT_QuadPFJet98_83_71_15_PFBTagDeepJet_1p3_VBF2_v1',
'HLT_QuadPFJet98_83_71_15_v5',
'HLT_Rsq0p35_v15',
'HLT_Rsq0p40_v15',
Expand Down Expand Up @@ -895,6 +909,7 @@
'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_CaloDiJet30_CaloBtagDeepCSV_1p5_v1',
'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_CaloDiJet30_v1',
'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepCSV_1p5_v1',
'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepJet_1p5_v1',
'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_v1',
'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_v13',
'HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_v11'
Expand Down
17 changes: 15 additions & 2 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
# pset.minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('HLTSiStripClusterChargeCutNone'))
# return process


def customiseHCALFor2018Input(process):
"""Customise the HLT to run on Run 2 data/MC using the old readout for the HCAL barel"""

Expand Down Expand Up @@ -68,7 +67,6 @@ def customiseHCALFor2018Input(process):
# done
return process


def customiseFor2017DtUnpacking(process):
"""Adapt the HLT to run the legacy DT unpacking
for pre2018 data/MC workflows as the default"""
Expand Down Expand Up @@ -143,6 +141,20 @@ def customiseFor2018Input(process):

return process

# HLT customisation for https://github.com/cms-sw/cmssw/pull/36639
def customiseFor36639(process):
"""Customisation for change of cfi template of the EDProducer "PFCandidatePrimaryVertexSorter" wrt 12_3_0_pre4.
This customisation can be removed once menus are migrated to 12_3_0_pre5.
Ref: https://github.com/cms-sw/cmssw/pull/36639
"""
for producer in producers_by_type(process, 'PFCandidatePrimaryVertexSorter'):
if hasattr(producer, 'assignment') and hasattr(producer.assignment, 'NumOfPUVtxsForCharged'):
if isinstance(producer.assignment.NumOfPUVtxsForCharged, cms.int32):
producer.assignment.NumOfPUVtxsForCharged = cms.uint32(max(0, producer.assignment.NumOfPUVtxsForCharged.value()))
elif not isinstance(producer.assignment.NumOfPUVtxsForCharged, cms.uint32):
raise Exception('invalid type for parameter "assignment.NumOfPUVtxsForCharged":\n'+producer.dumpPython())

return process

# CMSSW version specific customizations
def customizeHLTforCMSSW(process, menuType="GRun"):
Expand All @@ -153,5 +165,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"):

# add call to action function in proper order: newest last!
# process = customiseFor12718(process)
process = customiseFor36639(process)

return process
19 changes: 17 additions & 2 deletions HLTrigger/Configuration/tables/GRun.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,20 @@ HLT_IsoMu24_eta2p1_LooseDeepTauPFTauHPS180_eta2p1_v* # CMSHLT-2209
HLT_IsoMu24_eta2p1_LooseDeepTauPFTauHPS50_eta2p1_v* # CMSHLT-2209
HLT_LooseDeepTauPFTauHPS180_L2NN_eta2p1_v* # CMSHLT-2209
HLT_LooseDeepTauPFTauHPS50_eta2p1_MET100_v* # CMSHLT-2209
HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepJet_4p5_v* # CMSHLT-2184
HLT_PFHT400_FivePFJet_100_100_60_30_30_DoublePFBTagDeepJet_4p5_v* # CMSHLT-2184
HLT_PFHT400_FivePFJet_120_120_60_30_30_DoublePFBTagDeepJet_4p5_v* # CMSHLT-2184
HLT_PFHT400_SixPFJet32_DoublePFBTagDeepJet_2p94_v* # CMSHLT-2184
HLT_PFHT450_SixPFJet36_PFBTagDeepJet_1p59_v* # CMSHLT-2184
HLT_QuadPFJet103_88_75_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v* # CMSHLT-2184
HLT_QuadPFJet103_88_75_15_PFBTagDeepJet_1p3_VBF2_v* # CMSHLT-2184
HLT_QuadPFJet105_88_76_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v* # CMSHLT-2184
HLT_QuadPFJet105_88_76_15_PFBTagDeepJet_1p3_VBF2_v* # CMSHLT-2184
HLT_QuadPFJet111_90_80_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v* # CMSHLT-2184
HLT_QuadPFJet111_90_80_15_PFBTagDeepJet_1p3_VBF2_v* # CMSHLT-2184
HLT_QuadPFJet98_83_71_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v* # CMSHLT-2184
HLT_QuadPFJet98_83_71_15_PFBTagDeepJet_1p3_VBF2_v* # CMSHLT-2184
HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepJet_1p5_v* # CMSHLT-2184

HLT_L1SingleMuCosmics_v* # CMSHLT-2097

Expand Down Expand Up @@ -739,9 +753,10 @@ MC_Diphoton10_10_R9Id_OR_IsoCaloId_AND_HE_R9Id_Mass10_v* # CMSHLT-325, mod CMSHL
MC_IsoMu_v* # CMSHLT-322, CMSHLT-335
MC_DoubleMu_TrkIsoVVL_DZ_v* # CMSHLT-322
MC_DoubleMuNoFiltersNoVtx_v* # CMSHLT-322
MC_PFBTagDeepCSV_v* # CMSHLT-1241
MC_CaloBTagDeepCSV_v* # CMSHLT-1241
MC_PFBTagDeepCSV_v* # CMSHLT-1241
MC_CaloBTagDeepCSV_v* # CMSHLT-1241
MC_AK4CaloJetsFromPV_v* # CMSHLT-1241
MC_PFBTagDeepJet_v* # CMSHLT-2184

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

Expand Down
14 changes: 14 additions & 0 deletions HLTrigger/Configuration/tables/online_grun.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,20 @@ HLT_IsoMu24_eta2p1_LooseDeepTauPFTauHPS180_eta2p1_v* # CMSHLT-2209
HLT_IsoMu24_eta2p1_LooseDeepTauPFTauHPS50_eta2p1_v* # CMSHLT-2209
HLT_LooseDeepTauPFTauHPS180_L2NN_eta2p1_v* # CMSHLT-2209
HLT_LooseDeepTauPFTauHPS50_eta2p1_MET100_v* # CMSHLT-2209
HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepJet_4p5_v* # CMSHLT-2184
HLT_PFHT400_FivePFJet_100_100_60_30_30_DoublePFBTagDeepJet_4p5_v* # CMSHLT-2184
HLT_PFHT400_FivePFJet_120_120_60_30_30_DoublePFBTagDeepJet_4p5_v* # CMSHLT-2184
HLT_PFHT400_SixPFJet32_DoublePFBTagDeepJet_2p94_v* # CMSHLT-2184
HLT_PFHT450_SixPFJet36_PFBTagDeepJet_1p59_v* # CMSHLT-2184
HLT_QuadPFJet103_88_75_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v* # CMSHLT-2184
HLT_QuadPFJet103_88_75_15_PFBTagDeepJet_1p3_VBF2_v* # CMSHLT-2184
HLT_QuadPFJet105_88_76_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v* # CMSHLT-2184
HLT_QuadPFJet105_88_76_15_PFBTagDeepJet_1p3_VBF2_v* # CMSHLT-2184
HLT_QuadPFJet111_90_80_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v* # CMSHLT-2184
HLT_QuadPFJet111_90_80_15_PFBTagDeepJet_1p3_VBF2_v* # CMSHLT-2184
HLT_QuadPFJet98_83_71_15_DoublePFBTagDeepJet_1p3_7p7_VBF1_v* # CMSHLT-2184
HLT_QuadPFJet98_83_71_15_PFBTagDeepJet_1p3_VBF2_v* # CMSHLT-2184
HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_PFBtagDeepJet_1p5_v* # CMSHLT-2184

HLT_L1SingleMuCosmics_v* # CMSHLT-2097

Expand Down
Loading