Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3,602 changes: 1,295 additions & 2,307 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

949 changes: 884 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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_4_0/HIon --type HIon

# /dev/CMSSW_12_4_0/HIon/V42 (CMSSW_12_4_0_pre4_HLT1)
# /dev/CMSSW_12_4_0/HIon/V50 (CMSSW_12_4_0_pre4_HLT1)

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/V42')
tableName = cms.string('/dev/CMSSW_12_4_0/HIon/V50')
)

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

# /dev/CMSSW_12_4_0/PIon/V42 (CMSSW_12_4_0_pre4_HLT1)
# /dev/CMSSW_12_4_0/PIon/V50 (CMSSW_12_4_0_pre4_HLT1)

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

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

# /dev/CMSSW_12_4_0/PRef/V42 (CMSSW_12_4_0_pre4_HLT1)
# /dev/CMSSW_12_4_0/PRef/V50 (CMSSW_12_4_0_pre4_HLT1)

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

fragment.transferSystem = cms.PSet(
Expand Down
6 changes: 6 additions & 0 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -911,8 +911,11 @@
'HLT_Dimuon0_Upsilon_Muon_NoL1Mass_v6',
'HLT_Dimuon0_Upsilon_NoVertexing_v7',
'HLT_Dimuon10_PsiPrime_Barrel_Seagulls_v7',
'HLT_Dimuon10_Upsilon_y1p4_v2',
'HLT_Dimuon12_Upsilon_y1p4_v2',
'HLT_Dimuon14_Phi_Barrel_Seagulls_v7',
'HLT_Dimuon14_PsiPrime_noCorrL1_v6',
'HLT_Dimuon14_PsiPrime_v14',
'HLT_Dimuon18_PsiPrime_noCorrL1_v6',
'HLT_Dimuon18_PsiPrime_v14',
'HLT_Dimuon20_Jpsi_Barrel_Seagulls_v7',
Expand All @@ -927,8 +930,11 @@
'HLT_DoubleMu3_Trk_Tau3mu_NoL1Mass_v6',
'HLT_DoubleMu3_Trk_Tau3mu_v12',
'HLT_DoubleMu4_3_Bs_v15',
'HLT_DoubleMu4_3_Displaced_Photon4_BsToMMG_v1',
'HLT_DoubleMu4_3_Jpsi_v15',
'HLT_DoubleMu4_3_Photon4_BsToMMG_v1',
'HLT_DoubleMu4_JpsiTrkTrk_Displaced_v7',
'HLT_DoubleMu4_JpsiTrk_Bc_v1',
'HLT_DoubleMu4_Jpsi_Displaced_v7',
'HLT_DoubleMu4_Jpsi_NoVertexing_v7',
'HLT_DoubleMu4_MuMuTrk_Displaced_v15',
Expand Down
30 changes: 26 additions & 4 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,11 @@ def customiseEGammaRecoFor2018Input(process):
return process

def customiseBeamSpotFor2018Input(process):
# For Run-2 data, disable the use of the BS transient record, to read the BS record from SCAL.
# Additionally, remove all instances of OnlineBeamSpotESProducer (not needed if useTransientRecord=False).
# See CMSHLT-2271 and CMSHLT-2300 for further details.
"""Customisation for the HLT BeamSpot when running on Run-2 (2018) data:
- For Run-2 data, disable the use of the BS transient record, in order to read the BS record from SCAL.
- Additionally, remove all instances of OnlineBeamSpotESProducer (not needed if useTransientRecord=False).
- See CMSHLT-2271 and CMSHLT-2300 for further details.
"""
for prod in producers_by_type(process, 'BeamSpotOnlineProducer'):
prod.useTransientRecord = False
onlineBeamSpotESPLabels = [prod.label_() for prod in esproducers_by_type(process, 'OnlineBeamSpotESProducer')]
Expand All @@ -163,6 +165,26 @@ def customiseBeamSpotFor2018Input(process):

return process

def customiseECALCalibrationsFor2018Input(process):
"""Customisation to apply the ECAL Run-2 Ultra-Legacy calibrations (CMSHLT-2339)"""
if hasattr(process, 'GlobalTag'):
if not hasattr(process.GlobalTag, 'toGet'):
process.GlobalTag.toGet = cms.VPSet()
process.GlobalTag.toGet += [
cms.PSet(
record = cms.string('EcalLaserAlphasRcd'),
tag = cms.string('EcalLaserAlphas_UL_Run1_Run2_2018_lastIOV_movedTo1')
),
cms.PSet(
record = cms.string('EcalIntercalibConstantsRcd'),
tag = cms.string('EcalIntercalibConstants_UL_Run1_Run2_2018_lastIOV_movedTo1')
)
]
else:
print('# customiseECALCalibrationsFor2018Input -- the process.GlobalTag ESSource does not exist: no customisation applied.')

return process

def customiseFor2018Input(process):
"""Customise the HLT to run on Run 2 data/MC"""
process = customisePixelGainForRun2Input(process)
Expand All @@ -171,12 +193,12 @@ def customiseFor2018Input(process):
process = customiseCTPPSFor2018Input(process)
process = customiseEGammaRecoFor2018Input(process)
process = customiseBeamSpotFor2018Input(process)
process = customiseECALCalibrationsFor2018Input(process)

return process


def customiseForOffline(process):

# For running HLT offline on Run-3 Data, use "(OnlineBeamSpotESProducer).timeThreshold = 1e6",
# in order to pick the beamspot that was actually used by the HLT (instead of a "fake" beamspot).
# These same settings can be used offline for Run-3 Data and Run-3 MC alike.
Expand Down
12 changes: 9 additions & 3 deletions HLTrigger/Configuration/tables/GRun.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,10 @@ HLT_Mu25_TkMu0_Phi_v* # CMSHLT-1275
HLT_Mu10_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT350_PFMETNoMu60_v* # CMSHLT-1277
HLT_Mu8_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT300_PFMETNoMu60_v* # CMSHLT-1277
HLT_DoubleMu20_7_Mass0to30_Photon23_v* # CMSHLT-1278
HLT_Dimuon18_PsiPrime_v* # CMSHLT-1279
HLT_Dimuon14_PsiPrime_v* # CMSHLT-2327
HLT_Dimuon14_PsiPrime_noCorrL1_v* # CMSHLT-2327
HLT_Dimuon18_PsiPrime_v* # CMSHLT-1279
HLT_Dimuon18_PsiPrime_noCorrL1_v* # CMSHLT-1380
HLT_Dimuon25_Jpsi_v* # CMSHLT-1279
HLT_L1NotBptxOR_v* # CMSHLT-1280
HLT_L1UnpairedBunchBptxMinus_v* # CMSHLT-1280
Expand Down Expand Up @@ -335,7 +338,6 @@ HLT_Ele145_CaloIdVT_GsfTrkIdT_v* # CMSHLT-1379
HLT_Ele200_CaloIdVT_GsfTrkIdT_v* # CMSHLT-1379
HLT_Ele250_CaloIdVT_GsfTrkIdT_v* # CMSHLT-1379
HLT_Ele300_CaloIdVT_GsfTrkIdT_v* # CMSHLT-1379
HLT_Dimuon18_PsiPrime_noCorrL1_v* # CMSHLT-1380
HLT_Dimuon24_Phi_noCorrL1_v* # CMSHLT-1380
HLT_Dimuon24_Upsilon_noCorrL1_v* # CMSHLT-1380
HLT_Dimuon25_Jpsi_noCorrL1_v* # CMSHLT-1380
Expand All @@ -347,6 +349,7 @@ HLT_Mu43NoFiltersNoVtx_Photon43_CaloIdL_v* # CMSHLT-1381
HLT_Mu48NoFiltersNoVtx_Photon48_CaloIdL_v* # CMSHLT-1381
HLT_Dimuon0_Jpsi3p5_Muon2_v* # CMSHLT-1383
HLT_DoubleMu4_JpsiTrkTrk_Displaced_v* # CMSHLT-1384, CMSHLT-2232
HLT_DoubleMu4_JpsiTrk_Bc_v* # CMSHLT-2328
HLT_PFMET120_PFMHT120_IDTight_PFHT60_v* # CMSHLT-1385
HLT_PFMETNoMu120_PFMHTNoMu120_IDTight_PFHT60_v* # CMSHLT-1385
HLT_PFMETTypeOne120_PFMHT120_IDTight_PFHT60_v* # CMSHLT-1385
Expand Down Expand Up @@ -480,6 +483,8 @@ HLT_DoubleMu4_3_LowMass_v* # CMSHLT-2261
HLT_DoubleMu4_LowMass_Displaced_v* # CMSHLT-2261
HLT_Mu0_L1DoubleMu_v* # CMSHLT-2261
HLT_Mu4_L1DoubleMu_v* # CMSHLT-2261
HLT_DoubleMu4_3_Photon4_BsToMMG_v* # CMSHLT-2317
HLT_DoubleMu4_3_Displaced_Photon4_BsToMMG_v* # CMSHLT-2317
HLT_MediumChargedIsoPFTau200HighPtRelaxedIso_Trk50_eta2p1_v* # CMSHLT-1729
HLT_MediumChargedIsoPFTau220HighPtRelaxedIso_Trk50_eta2p1_v* # CMSHLT-1729
HLT_AK8PFJet330_TrimMass30_PFAK8BoostedDoubleB_p02_v* # CMSHLT-1732
Expand Down Expand Up @@ -546,7 +551,8 @@ HLT_DoubleMu40NoFiltersNoVtxDisplaced_v* # CMSHLT-1786
HLT_Mu38NoFiltersNoVtxDisplaced_Photon38_CaloIdL_v* # CMSHLT-1786
HLT_Mu43NoFiltersNoVtxDisplaced_Photon43_CaloIdL_v* # CMSHLT-1786
HLT_Diphoton30_18_R9IdL_AND_HE_AND_IsoCaloId_Mass55_v* # CMSHLT-1812, CMSHLT-2333
HLT_Dimuon12_Upsilon_y1p4_v* # CMSHLT-1796
HLT_Dimuon10_Upsilon_y1p4_v* # CMSHLT-2327
HLT_Dimuon12_Upsilon_y1p4_v* # CMSHLT-1796
HLT_Photon30EB_TightID_TightIso_v* # CMSHLT-2314
HLT_Photon100EB_TightID_TightIso_v* # CMSHLT-1789
HLT_Photon110EB_TightID_TightIso_v* # CMSHLT-1789
Expand Down
12 changes: 9 additions & 3 deletions HLTrigger/Configuration/tables/online_grun.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,10 @@ HLT_Mu25_TkMu0_Phi_v* # CMSHLT-1275
HLT_Mu10_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT350_PFMETNoMu60_v* # CMSHLT-1277
HLT_Mu8_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT300_PFMETNoMu60_v* # CMSHLT-1277
HLT_DoubleMu20_7_Mass0to30_Photon23_v* # CMSHLT-1278
HLT_Dimuon18_PsiPrime_v* # CMSHLT-1279
HLT_Dimuon14_PsiPrime_v* # CMSHLT-2327
HLT_Dimuon14_PsiPrime_noCorrL1_v* # CMSHLT-2327
HLT_Dimuon18_PsiPrime_v* # CMSHLT-1279
HLT_Dimuon18_PsiPrime_noCorrL1_v* # CMSHLT-1380
HLT_Dimuon25_Jpsi_v* # CMSHLT-1279
HLT_L1NotBptxOR_v* # CMSHLT-1280
HLT_L1UnpairedBunchBptxMinus_v* # CMSHLT-1280
Expand Down Expand Up @@ -335,7 +338,6 @@ HLT_Ele145_CaloIdVT_GsfTrkIdT_v* # CMSHLT-1379
HLT_Ele200_CaloIdVT_GsfTrkIdT_v* # CMSHLT-1379
HLT_Ele250_CaloIdVT_GsfTrkIdT_v* # CMSHLT-1379
HLT_Ele300_CaloIdVT_GsfTrkIdT_v* # CMSHLT-1379
HLT_Dimuon18_PsiPrime_noCorrL1_v* # CMSHLT-1380
HLT_Dimuon24_Phi_noCorrL1_v* # CMSHLT-1380
HLT_Dimuon24_Upsilon_noCorrL1_v* # CMSHLT-1380
HLT_Dimuon25_Jpsi_noCorrL1_v* # CMSHLT-1380
Expand All @@ -347,6 +349,7 @@ HLT_Mu43NoFiltersNoVtx_Photon43_CaloIdL_v* # CMSHLT-1381
HLT_Mu48NoFiltersNoVtx_Photon48_CaloIdL_v* # CMSHLT-1381
HLT_Dimuon0_Jpsi3p5_Muon2_v* # CMSHLT-1383
HLT_DoubleMu4_JpsiTrkTrk_Displaced_v* # CMSHLT-1384, CMSHLT-2232
HLT_DoubleMu4_JpsiTrk_Bc_v* # CMSHLT-2328
HLT_PFMET120_PFMHT120_IDTight_PFHT60_v* # CMSHLT-1385
HLT_PFMETNoMu120_PFMHTNoMu120_IDTight_PFHT60_v* # CMSHLT-1385
HLT_PFMETTypeOne120_PFMHT120_IDTight_PFHT60_v* # CMSHLT-1385
Expand Down Expand Up @@ -479,6 +482,8 @@ HLT_DoubleMu4_3_LowMass_v* # CMSHLT-2261
HLT_DoubleMu4_LowMass_Displaced_v* # CMSHLT-2261
HLT_Mu0_L1DoubleMu_v* # CMSHLT-2261
HLT_Mu4_L1DoubleMu_v* # CMSHLT-2261
HLT_DoubleMu4_3_Photon4_BsToMMG_v* # CMSHLT-2317
HLT_DoubleMu4_3_Displaced_Photon4_BsToMMG_v* # CMSHLT-2317
HLT_MediumChargedIsoPFTau200HighPtRelaxedIso_Trk50_eta2p1_v* # CMSHLT-1729
HLT_MediumChargedIsoPFTau220HighPtRelaxedIso_Trk50_eta2p1_v* # CMSHLT-1729
HLT_AK8PFJet330_TrimMass30_PFAK8BoostedDoubleB_p02_v* # CMSHLT-1732
Expand Down Expand Up @@ -545,7 +550,8 @@ HLT_DoubleMu40NoFiltersNoVtxDisplaced_v* # CMSHLT-1786
HLT_Mu38NoFiltersNoVtxDisplaced_Photon38_CaloIdL_v* # CMSHLT-1786
HLT_Mu43NoFiltersNoVtxDisplaced_Photon43_CaloIdL_v* # CMSHLT-1786
HLT_Diphoton30_18_R9IdL_AND_HE_AND_IsoCaloId_Mass55_v* # CMSHLT-1812, CMSHLT-2333
HLT_Dimuon12_Upsilon_y1p4_v* # CMSHLT-1796
HLT_Dimuon10_Upsilon_y1p4_v* # CMSHLT-2327
HLT_Dimuon12_Upsilon_y1p4_v* # CMSHLT-1796
HLT_Photon30EB_TightID_TightIso_v* # CMSHLT-2314
HLT_Photon100EB_TightID_TightIso_v* # CMSHLT-1789
HLT_Photon110EB_TightID_TightIso_v* # CMSHLT-1789
Expand Down
Loading