Skip to content

Commit

Permalink
Merge pull request #43842 from cms-tsg-storm/HLTdevelopment133X_for140X
Browse files Browse the repository at this point in the history 
HLT development for 13_3 2/N [14_0_X]
  • Loading branch information
@cmsbuild
cmsbuild authored Feb 2, 2024
2 parents 695ed78 + fb08b71 commit 9547b42
Show file tree
Hide file tree
Showing 27 changed files with 21,195 additions and 19,109 deletions.
8,653 changes: 4,448 additions & 4,205 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file

Large diffs are not rendered by default.

9,547 changes: 4,895 additions & 4,652 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file

Large diffs are not rendered by default.

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

# /dev/CMSSW_13_3_0/HIon/V17 (CMSSW_13_3_0)
# /dev/CMSSW_13_3_0/HIon/V21 (CMSSW_13_3_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_13_3_0/HIon/V17')
tableName = cms.string('/dev/CMSSW_13_3_0/HIon/V21')
)

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

# /dev/CMSSW_13_3_0/PIon/V17 (CMSSW_13_3_0)
# /dev/CMSSW_13_3_0/PIon/V21 (CMSSW_13_3_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_13_3_0/PIon/V17')
tableName = cms.string('/dev/CMSSW_13_3_0/PIon/V21')
)

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

# /dev/CMSSW_13_3_0/PRef/V17 (CMSSW_13_3_0)
# /dev/CMSSW_13_3_0/PRef/V21 (CMSSW_13_3_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_13_3_0/PRef/V17')
tableName = cms.string('/dev/CMSSW_13_3_0/PRef/V21')
)

fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
Expand Down
1,861 changes: 1,252 additions & 609 deletions HLTrigger/Configuration/python/HLT_Special_cff.py
View file

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,12 @@
'HLT_DoubleMediumDeepTauPFTauHPS30_L2NN_eta2p1_PFJet60_v6',
'HLT_DoubleMediumDeepTauPFTauHPS30_L2NN_eta2p1_PFJet75_v6',
'HLT_DoubleMediumDeepTauPFTauHPS35_L2NN_eta2p1_v6',
'HLT_LooseDeepTauPFTauHPS180_L2NN_eta2p1_v7'
'HLT_DoublePNetTauhPFJet30_Medium_L2NN_eta2p3_v1',
'HLT_DoublePNetTauhPFJet30_Tight_L2NN_eta2p3_v1',
'HLT_LooseDeepTauPFTauHPS180_L2NN_eta2p1_v7',
'HLT_SinglePNetTauhPFJet130_Loose_L2NN_eta2p3_v1',
'HLT_SinglePNetTauhPFJet130_Medium_L2NN_eta2p3_v1',
'HLT_SinglePNetTauhPFJet130_Tight_L2NN_eta2p3_v1'
)


Expand Down Expand Up @@ -2081,10 +2086,14 @@
'HLT_IsoMu24_eta2p1_MediumDeepTauPFTauHPS30_L2NN_eta2p1_PFJet75_CrossL1_v6',
'HLT_IsoMu24_eta2p1_MediumDeepTauPFTauHPS35_L2NN_eta2p1_CrossL1_v7',
'HLT_IsoMu24_eta2p1_MediumDeepTauPFTauHPS45_L2NN_eta2p1_CrossL1_v6',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Loose_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Medium_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Tight_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet30_Medium_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet30_Tight_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_v21',
'HLT_IsoMu24_v19',
'HLT_IsoMu27_MediumChargedIsoDisplacedPFTauHPS24_eta2p1_SingleL1_v2',
'HLT_IsoMu27_MediumDeepTauPFTauHPS20_eta2p1_SingleL1_v6',
'HLT_IsoMu27_v22',
'HLT_IsoMu50_AK8PFJet220_SoftDropMass40_PNetBB0p06_v3',
'HLT_IsoMu50_AK8PFJet220_SoftDropMass40_v6',
Expand Down Expand Up @@ -2190,10 +2199,14 @@
'HLT_IsoMu24_eta2p1_MediumDeepTauPFTauHPS30_L2NN_eta2p1_PFJet75_CrossL1_v6',
'HLT_IsoMu24_eta2p1_MediumDeepTauPFTauHPS35_L2NN_eta2p1_CrossL1_v7',
'HLT_IsoMu24_eta2p1_MediumDeepTauPFTauHPS45_L2NN_eta2p1_CrossL1_v6',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Loose_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Medium_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Tight_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet30_Medium_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_PNetTauhPFJet30_Tight_L2NN_eta2p3_CrossL1_v1',
'HLT_IsoMu24_eta2p1_v21',
'HLT_IsoMu24_v19',
'HLT_IsoMu27_MediumChargedIsoDisplacedPFTauHPS24_eta2p1_SingleL1_v2',
'HLT_IsoMu27_MediumDeepTauPFTauHPS20_eta2p1_SingleL1_v6',
'HLT_IsoMu27_v22',
'HLT_IsoMu50_AK8PFJet220_SoftDropMass40_PNetBB0p06_v3',
'HLT_IsoMu50_AK8PFJet220_SoftDropMass40_v6',
Expand Down
11 changes: 11 additions & 0 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_Special_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,17 @@
streamPhysicsCommissioning_datasetMuonShower_selector.throw = cms.bool(False)
streamPhysicsCommissioning_datasetMuonShower_selector.triggerConditions = cms.vstring('HLT_CscCluster_Cosmic_v1')

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsCommissioning_datasetNoBPTX_selector
streamPhysicsCommissioning_datasetNoBPTX_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsCommissioning_datasetNoBPTX_selector.l1tResults = cms.InputTag('')
streamPhysicsCommissioning_datasetNoBPTX_selector.throw = cms.bool(False)
streamPhysicsCommissioning_datasetNoBPTX_selector.triggerConditions = cms.vstring(
'HLT_L2Mu10_NoVertex_NoBPTX3BX_v10',
'HLT_L2Mu10_NoVertex_NoBPTX_v11',
'HLT_L2Mu40_NoVertex_3Sta_NoBPTX3BX_v10',
'HLT_L2Mu45_NoVertex_3Sta_NoBPTX3BX_v9'
)

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsCommissioning_datasetZeroBias_selector
streamPhysicsCommissioning_datasetZeroBias_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsCommissioning_datasetZeroBias_selector.l1tResults = cms.InputTag('')
Expand Down
17 changes: 14 additions & 3 deletions HLTrigger/Configuration/tables/GRun.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,6 @@ HLT_IsoMu24_TwoProngs35_v* # CMSHLT-1885
HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_PFDiJet30_v* # CMSHLT-1796
HLT_Mu8_TrkIsoVVL_Ele23_CaloIdL_TrackIdL_IsoVL_DZ_CaloDiJet30_v* # CMSHLT-1796
HLT_VBF_DoubleMediumDeepTauPFTauHPS20_eta2p1_v* # CMSHLT-2289
HLT_IsoMu27_MediumDeepTauPFTauHPS20_eta2p1_SingleL1_v* # CMSHLT-2349
HLT_ZeroBias_Alignment_v* # CMSHLT-1892
HLT_CDC_L2cosmic_5p5_er1p0_v* # CMSHLT-1896
HLT_Ele30_WPTight_Gsf_v* # CMSHLT-1921
Expand All @@ -448,8 +447,6 @@ HLT_PFHT400_SixPFJet32_v* # CMSHLT-1857, CMSHLT-2705
HLT_PFHT400_SixPFJet32_PNet2BTagMean0p50_v* # CMSHLT-2705
HLT_PFHT450_SixPFJet36_v* # CMSHLT-1857, CMSHLT-2705
HLT_PFHT450_SixPFJet36_PNetBTag0p35_v* # CMSHLT-2705
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
Expand Down Expand Up @@ -731,6 +728,17 @@ HLT_PFJet200_TimeGt2p5ns_v* # CMSHLT-2754
HLT_Photon50_TimeLtNeg2p5ns_v* # CMSHLT-2754
HLT_Photon50_TimeGt2p5ns_v* # CMSHLT-2754

HLT_IsoMu24_eta2p1_PNetTauhPFJet30_Medium_L2NN_eta2p3_CrossL1_v* # CMSHLT-2974
HLT_IsoMu24_eta2p1_PNetTauhPFJet30_Tight_L2NN_eta2p3_CrossL1_v* # CMSHLT-2974
HLT_DoublePNetTauhPFJet30_Medium_L2NN_eta2p3_v* # CMSHLT-2974
HLT_DoublePNetTauhPFJet30_Tight_L2NN_eta2p3_v* # CMSHLT-2974
HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Loose_L2NN_eta2p3_CrossL1_v* # CMSHLT-2974
HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Medium_L2NN_eta2p3_CrossL1_v* # CMSHLT-2974
HLT_IsoMu24_eta2p1_PNetTauhPFJet130_Tight_L2NN_eta2p3_CrossL1_v* # CMSHLT-2974
HLT_SinglePNetTauhPFJet130_Loose_L2NN_eta2p3_v* # CMSHLT-2974
HLT_SinglePNetTauhPFJet130_Medium_L2NN_eta2p3_v* # CMSHLT-2974
HLT_SinglePNetTauhPFJet130_Tight_L2NN_eta2p3_v* # CMSHLT-2974

HLT_L1SingleMuCosmics_v* # CMSHLT-2097

HLT_PPSMaxTracksPerArm1_v* # CMSHLT-2179
Expand Down Expand Up @@ -797,6 +805,9 @@ ParkingVBF3Output # CMSHLT-2702

######## MC paths - template paths only for MC (only in GRun, not in online) ################################

HLT_PFHT400_SixPFJet32_DoublePFBTagDeepJet_2p94_v* # CMSHLT-2184, CMSHLT-2830
HLT_PFHT450_SixPFJet36_PFBTagDeepJet_1p59_v* # CMSHLT-2184, CMSHLT-2830

MC_ReducedIterativeTracking_v* # CMSHLT-68, updated by CMSHLT-107 -> TEMPLATE PATH, in GRun but prescaled to 0
MC_PFMET_v* # CMSHLT-314
MC_AK4PFJets_v* # CMSHLT-314
Expand Down
11 changes: 11 additions & 0 deletions HLTrigger/Configuration/tables/Special.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@ HLT_ZeroBias_Gated_v* # CMSHLT-2860
HLT_SpecialHLTPhysics_v* # CMSHLT-2860
HLT_SpecialZeroBias_v* # CMSHLT-2860

HLT_L1SingleEG10er2p5_v* # CMSHLT-2860
HLT_L1SingleEG15er2p5_v* # CMSHLT-2860
HLT_L2Mu10_NoVertex_NoBPTX3BX_v* # CMSHLT-2197
HLT_L2Mu10_NoVertex_NoBPTX_v* # CMSHLT-2197
HLT_L2Mu45_NoVertex_3Sta_NoBPTX3BX_v* # CMSHLT-2197
HLT_L2Mu40_NoVertex_3Sta_NoBPTX3BX_v* # CMSHLT-2197
DQM_EcalReconstruction_v* # CMSHLT-2287
DQM_HcalReconstruction_v* # CMSHLT-2287
DQM_PixelReconstruction_v* # CMSHLT-2287

## EndPaths / FinalPaths ##

ALCALumiPixelsCountsExpressOutput
Expand All @@ -108,6 +118,7 @@ CalibrationOutput
DQMOutput
DQMCalibrationOutput
DQMEventDisplayOutput
DQMGPUvsCPUOutput
DQMOnlineBeamspotOutput
DQMPPSRandomOutput
EcalCalibrationOutput
Expand Down
65 changes: 0 additions & 65 deletions HLTrigger/Configuration/tables/craft.txt
View file

This file was deleted.

57 changes: 0 additions & 57 deletions HLTrigger/Configuration/tables/cruzet.txt
View file

This file was deleted.

11 changes: 0 additions & 11 deletions HLTrigger/Configuration/tables/makeCRAFT
View file

This file was deleted.

11 changes: 0 additions & 11 deletions HLTrigger/Configuration/tables/makeCRUZET
View file

This file was deleted.

12 changes: 0 additions & 12 deletions HLTrigger/Configuration/tables/makeOnline0T
View file

This file was deleted.

11 changes: 11 additions & 0 deletions HLTrigger/Configuration/tables/makeOnlineCosmics
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#! /bin/bash
#
# generate HLT tables from master table in ConfDB
#

MASTER="/online/special/2024/v1.0/HLT" # no version, take the latest one
TARGET="/online/special/2024/v1.0/Cosmics" # directory where to store the sub-tables
TABLES="online_cosmics" # which sub-tables to create

source subtables.sh
createSubtables "v3/run3" "$MASTER" "$TARGET" "$TABLES"
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/makeOnlineSpecial
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

MASTER="/dev/CMSSW_13_3_0/HLT" # no version, take the latest one
TARGET="/online/special/2023/v1.0/HLT" # where to store the online-compliant menu
TARGET="/online/special/2024/v1.0/HLT" # where to store the online-compliant menu
TABLES="online_special"

source subtables.sh
Expand Down
11 changes: 0 additions & 11 deletions HLTrigger/Configuration/tables/makeTest
View file

This file was deleted.

Loading

0 comments on commit 9547b42

Please sign in to comment.