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

Jump to bottom

HLT menu development for 12_4_X (7/N) #39114

Merged
merged 1 commit into from
Aug 23, 2022
Merged

HLT menu development for 12_4_X (7/N) #39114

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
399 changes: 216 additions & 183 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

349 changes: 191 additions & 158 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_4_0/HIon --type HIon

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

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_4_0/PIon --type PIon

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

fragment.transferSystem = cms.PSet(
Expand Down
8 changes: 4 additions & 4 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_4_0/PRef --type PRef

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

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -2580,9 +2580,9 @@
ExpressAlignment = cms.vstring( 'ExpressAlignment' ),
ExpressCosmics = cms.vstring( ),
NanoDST = cms.vstring( 'L1Accept' ),
PhysicsCommissioning = cms.vstring( 'HLTPhysics',
PhysicsCommissioning = cms.vstring( 'EmptyBX',
'HLTPhysics',
'ZeroBias' ),
PhysicsEndOfFill = cms.vstring( 'EmptyBX' ),
PhysicsHIZeroBias1 = cms.vstring( 'HIZeroBias1',
'HIZeroBias2' ),
PhysicsHIZeroBias2 = cms.vstring( 'HIZeroBias3',
Expand Down
296 changes: 150 additions & 146 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 10 additions & 13 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@

# stream PhysicsCommissioning

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsCommissioning_datasetEmptyBX_selector
streamPhysicsCommissioning_datasetEmptyBX_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsCommissioning_datasetEmptyBX_selector.l1tResults = cms.InputTag('')
streamPhysicsCommissioning_datasetEmptyBX_selector.throw = cms.bool(False)
streamPhysicsCommissioning_datasetEmptyBX_selector.triggerConditions = cms.vstring(
'HLT_HIL1NotBptxORForPPRef_v3',
'HLT_HIL1UnpairedBunchBptxMinusForPPRef_v3',
'HLT_HIL1UnpairedBunchBptxPlusForPPRef_v3'
)

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsCommissioning_datasetHLTPhysics_selector
streamPhysicsCommissioning_datasetHLTPhysics_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsCommissioning_datasetHLTPhysics_selector.l1tResults = cms.InputTag('')
Expand All @@ -22,19 +32,6 @@
)


# stream PhysicsEndOfFill

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsEndOfFill_datasetEmptyBX_selector
streamPhysicsEndOfFill_datasetEmptyBX_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsEndOfFill_datasetEmptyBX_selector.l1tResults = cms.InputTag('')
streamPhysicsEndOfFill_datasetEmptyBX_selector.throw = cms.bool(False)
streamPhysicsEndOfFill_datasetEmptyBX_selector.triggerConditions = cms.vstring(
'HLT_HIL1NotBptxORForPPRef_v3',
'HLT_HIL1UnpairedBunchBptxMinusForPPRef_v3',
'HLT_HIL1UnpairedBunchBptxPlusForPPRef_v3'
)


# stream PhysicsHIZeroBias1

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsHIZeroBias1_datasetHIZeroBias1_selector
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@
'keep *_hltPPSCalibrationRaw_*_*',
'keep *_hltParticleFlowForTaus_*_*',
'keep *_hltParticleFlow_*_*',
'keep *_hltParticleNetDiscriminatorsJetTagsAK8_*_*',
'keep *_hltParticleNetDiscriminatorsJetTags_*_*',
'keep *_hltParticleNetONNXJetTagsAK8_*_*',
'keep *_hltPixelTracksCPU_*_*',
'keep *_hltPixelTracksFromGPU_*_*',
'keep *_hltPixelTracks_*_*',
Expand Down Expand Up @@ -652,8 +652,8 @@
'keep *_hltPPSCalibrationRaw_*_*',
'keep *_hltParticleFlowForTaus_*_*',
'keep *_hltParticleFlow_*_*',
'keep *_hltParticleNetDiscriminatorsJetTagsAK8_*_*',
'keep *_hltParticleNetDiscriminatorsJetTags_*_*',
'keep *_hltParticleNetONNXJetTagsAK8_*_*',
'keep *_hltPixelTracksCPU_*_*',
'keep *_hltPixelTracksFromGPU_*_*',
'keep *_hltPixelTracks_*_*',
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/scripts/hltIntegrationTests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ mkdir "$WORKDIR"
cd "$WORKDIR"

# find the list of all trigger paths
TRIGGERS=$(hltListPaths "$MENU" $HLTLISTPATHPROXY -p --no-dep --exclude "^HLTriggerFinalPath$" "^Dataset_.+")
TRIGGERS=$(hltListPaths "$MENU" $HLTLISTPATHPROXY -p --no-dep --exclude "^HLTriggerFinalPath$" "^Dataset_.+" "^DST_HLTMuon_Run3_PFScoutingPixelTracking_v[0-9]+$")
echo "${TRIGGERS[@]}" > paths.txt

# print some info
Expand Down
11 changes: 7 additions & 4 deletions HLTrigger/Configuration/tables/GRun.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ HLT_TripleMu_10_5_5_DZ_v* # CMSHLT-1311
HLT_TripleMu_12_10_5_v* # CMSHLT-1311
HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass3p8_v* # CMSHLT-1311, CMSHLT-1436
HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass8_v* # CMSHLT-1311, CMSHLT-1436
DST_Run3_PFScoutingPixelTracking_v* # CMSHLT-2120, CMSHLT-2231
DST_Run3_PFScoutingPixelTracking_v* # CMSHLT-2120, CMSHLT-2231
DST_HLTMuon_Run3_PFScoutingPixelTracking_v* # CMSHLT-2428
HLT_Ele12_CaloIdL_TrackIdL_IsoVL_PFJet30_v* # CMSHLT-1330
HLT_Ele17_CaloIdM_TrackIdM_PFJet30_v* # CMSHLT-1330
HLT_Ele23_CaloIdL_TrackIdL_IsoVL_PFJet30_v* # CMSHLT-1330
Expand Down Expand Up @@ -623,6 +624,7 @@ HLT_Diphoton20_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v* # CMSHLT-2282
HLT_Diphoton20_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v* # CMSHLT-2282
HLT_Diphoton22_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v* # CMSHLT-2282
HLT_Diphoton22_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v* # CMSHLT-2282
HLT_Mu50_L1SingleMuShower_v* # CMSHLT-2373

HLT_L1SingleMuCosmics_v* # CMSHLT-2097

Expand All @@ -638,11 +640,12 @@ DQM_PixelReconstruction_v* # CMSHLT-2287

## EndPaths / FinalPaths ##

PhysicsEndOfFillOutput
PhysicsCommissioningOutput
PhysicsDispJetBTagMuEGTauOutput # CMSHLT-2431
PhysicsEGammaOutput
PhysicsHadronsTausOutput
PhysicsMuonsOutput
PhysicsJetMETOutput # CMSHLT-2431
PhysicsMuonOutput # CMSHLT-2431
PhysicsReservedDoubleMuonLowMassOutput # CMSHLT-2431
PhysicsScoutingPFMonitorOutput # CMSHLT-487, CMSHLT-548, CMSHLT-599, CMSHLT-603, CMSHLT-2231
ScoutingPFOutput # CMSHLT-548, CMSHLT-2231
DQMOutput
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/tables/PRef.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ DQM_HIPixelReconstruction_v* # CMSHLT-2287, CMSHLT-2343, CMSHLT-2403

## EndPaths / FinalPaths ##

PhysicsEndOfFillOutput
PhysicsCommissioningOutput
PhysicsDispJetBTagMuEGTauOutput # CMSHLT-2431
PhysicsEGammaOutput
PhysicsHadronsTausOutput
PhysicsMuonsOutput
PhysicsForwardOutput
PhysicsJetMETOutput # CMSHLT-2431
PhysicsMuonOutput # CMSHLT-2431
PhysicsTracksOutput

PhysicsHIZeroBias1Output
Expand Down
11 changes: 7 additions & 4 deletions HLTrigger/Configuration/tables/online_grun.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ HLT_TripleMu_10_5_5_DZ_v* # CMSHLT-1311
HLT_TripleMu_12_10_5_v* # CMSHLT-1311
HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass3p8_v* # CMSHLT-1311, CMSHLT-1436
HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass8_v* # CMSHLT-1311, CMSHLT-1436
DST_Run3_PFScoutingPixelTracking_v* # CMSHLT-2120, CMSHLT-2231
DST_Run3_PFScoutingPixelTracking_v* # CMSHLT-2120, CMSHLT-2231
DST_HLTMuon_Run3_PFScoutingPixelTracking_v* # CMSHLT-2428
HLT_Ele12_CaloIdL_TrackIdL_IsoVL_PFJet30_v* # CMSHLT-1330
HLT_Ele17_CaloIdM_TrackIdM_PFJet30_v* # CMSHLT-1330
HLT_Ele23_CaloIdL_TrackIdL_IsoVL_PFJet30_v* # CMSHLT-1330
Expand Down Expand Up @@ -623,6 +624,7 @@ HLT_Diphoton20_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v* # CMSHLT-2282
HLT_Diphoton20_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v* # CMSHLT-2282
HLT_Diphoton22_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v* # CMSHLT-2282
HLT_Diphoton22_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v* # CMSHLT-2282
HLT_Mu50_L1SingleMuShower_v* # CMSHLT-2373

HLT_L1SingleMuCosmics_v* # CMSHLT-2097

Expand All @@ -638,11 +640,12 @@ DQM_PixelReconstruction_v* # CMSHLT-2287

## EndPaths / FinalPaths ##

PhysicsEndOfFillOutput
PhysicsCommissioningOutput
PhysicsDispJetBTagMuEGTauOutput # CMSHLT-2431
PhysicsEGammaOutput
PhysicsHadronsTausOutput
PhysicsMuonsOutput
PhysicsJetMETOutput # CMSHLT-2431
PhysicsMuonOutput # CMSHLT-2431
PhysicsReservedDoubleMuonLowMassOutput # CMSHLT-2431
PhysicsScoutingPFMonitorOutput # CMSHLT-487, CMSHLT-548, CMSHLT-599, CMSHLT-603, CMSHLT-2231
ScoutingPFOutput # CMSHLT-548, CMSHLT-2231
DQMOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_hion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,6 @@ PhysicsHIMinimumBiasReducedFormat11Output
PhysicsHITrackerNZSOutput
PhysicsHIForwardOutput

#HLTAnalyzerEndpath # only in 'HIon', not in 'online'
#HLTAnalyzerEndpath # only in 'HIon', not in 'online'
RatesMonitoring # only in 'online', not in 'HIon'
DQMHistograms # only in 'online', not in 'HIon'
8 changes: 4 additions & 4 deletions HLTrigger/Configuration/tables/online_pref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,12 @@ DQM_HIPixelReconstruction_v* # CMSHLT-2287, CMSHLT-2343, CMSHLT-2403

## EndPaths / FinalPaths ##

PhysicsEndOfFillOutput
PhysicsCommissioningOutput
PhysicsDispJetBTagMuEGTauOutput # CMSHLT-2431
PhysicsEGammaOutput
PhysicsHadronsTausOutput
PhysicsMuonsOutput
PhysicsForwardOutput
PhysicsJetMETOutput # CMSHLT-2431
PhysicsMuonOutput # CMSHLT-2431
PhysicsTracksOutput

PhysicsHIZeroBias1Output
Expand Down Expand Up @@ -215,6 +215,6 @@ NanoDSTOutput

######## paths that are different between PRef and online_pref ################################

#HLTAnalyzerEndpath # only in 'GRun', not in 'online'
#HLTAnalyzerEndpath # only in 'GRun', not in 'online'
RatesMonitoring # only in 'online', not in 'GRun'
DQMHistograms # only in 'online', not in 'GRun'