Skip to content

HLT menu development for 15_0_X (2/N) [15_1_X] #47529

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

Merged
merged 1 commit into from
Mar 7, 2025
Merged

HLT menu development for 15_0_X (2/N) [15_1_X] #47529

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
8 changes: 4 additions & 4 deletions HLTrigger/Configuration/python/HLT_2024v14_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 52 additions & 4 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

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

# /dev/CMSSW_15_0_0/Fake1/V5 (CMSSW_15_0_0)
# /dev/CMSSW_15_0_0/Fake1/V6 (CMSSW_15_0_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string("/dev/CMSSW_15_0_0/Fake1/V5")
tableName = cms.string("/dev/CMSSW_15_0_0/Fake1/V6")
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake2_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration /dev/CMSSW_15_0_0/Fake2 --cff --data --type Fake2

# /dev/CMSSW_15_0_0/Fake2/V5 (CMSSW_15_0_0)
# /dev/CMSSW_15_0_0/Fake2/V6 (CMSSW_15_0_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string("/dev/CMSSW_15_0_0/Fake2/V5")
tableName = cms.string("/dev/CMSSW_15_0_0/Fake2/V6")
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration /dev/CMSSW_15_0_0/Fake --cff --data --type Fake

# /dev/CMSSW_15_0_0/Fake/V5 (CMSSW_15_0_0)
# /dev/CMSSW_15_0_0/Fake/V6 (CMSSW_15_0_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string("/dev/CMSSW_15_0_0/Fake/V5")
tableName = cms.string("/dev/CMSSW_15_0_0/Fake/V6")
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
8 changes: 4 additions & 4 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 /dev/CMSSW_15_0_0/HIon --cff --data --type HIon

# /dev/CMSSW_15_0_0/HIon/V6 (CMSSW_15_0_0)
# /dev/CMSSW_15_0_0/HIon/V8 (CMSSW_15_0_0)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment.load("Configuration.StandardSequences.Accelerators_cff")

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string("/dev/CMSSW_15_0_0/HIon/V6")
tableName = cms.string("/dev/CMSSW_15_0_0/HIon/V8")
)

fragment.HLTGroupedCkfTrajectoryBuilderP5 = 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 /dev/CMSSW_15_0_0/PIon --cff --data --type PIon

# /dev/CMSSW_15_0_0/PIon/V6 (CMSSW_15_0_0)
# /dev/CMSSW_15_0_0/PIon/V8 (CMSSW_15_0_0)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment.load("Configuration.StandardSequences.Accelerators_cff")

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string("/dev/CMSSW_15_0_0/PIon/V6")
tableName = cms.string("/dev/CMSSW_15_0_0/PIon/V8")
)

fragment.HLTGroupedCkfTrajectoryBuilderP5 = 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 /dev/CMSSW_15_0_0/PRef --cff --data --type PRef

# /dev/CMSSW_15_0_0/PRef/V6 (CMSSW_15_0_0)
# /dev/CMSSW_15_0_0/PRef/V8 (CMSSW_15_0_0)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment.load("Configuration.StandardSequences.Accelerators_cff")

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string("/dev/CMSSW_15_0_0/PRef/V6")
tableName = cms.string("/dev/CMSSW_15_0_0/PRef/V8")
)

fragment.HLTGroupedCkfTrajectoryBuilderP5 = cms.PSet(
Expand Down
54 changes: 51 additions & 3 deletions HLTrigger/Configuration/python/HLT_Special_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_Special_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,30 @@
streamPhysicsSpecialHLTPhysics9_datasetSpecialHLTPhysics9_selector.triggerConditions = cms.vstring('HLT_SpecialHLTPhysics_v7')


# stream PhysicsSpecialMinimumBias0

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsSpecialMinimumBias0_datasetSpecialMinimumBias0_selector
streamPhysicsSpecialMinimumBias0_datasetSpecialMinimumBias0_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsSpecialMinimumBias0_datasetSpecialMinimumBias0_selector.l1tResults = cms.InputTag('')
streamPhysicsSpecialMinimumBias0_datasetSpecialMinimumBias0_selector.throw = cms.bool(False)
streamPhysicsSpecialMinimumBias0_datasetSpecialMinimumBias0_selector.triggerConditions = cms.vstring(
'HLT_L1MinimumBiasHF0ANDBptxAND_v1',
'HLT_PixelClusters_WP2_HighRate_v1'
)


# stream PhysicsSpecialMinimumBias1

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsSpecialMinimumBias1_datasetSpecialMinimumBias1_selector
streamPhysicsSpecialMinimumBias1_datasetSpecialMinimumBias1_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsSpecialMinimumBias1_datasetSpecialMinimumBias1_selector.l1tResults = cms.InputTag('')
streamPhysicsSpecialMinimumBias1_datasetSpecialMinimumBias1_selector.throw = cms.bool(False)
streamPhysicsSpecialMinimumBias1_datasetSpecialMinimumBias1_selector.triggerConditions = cms.vstring(
'HLT_L1MinimumBiasHF0ANDBptxAND_v1',
'HLT_PixelClusters_WP2_HighRate_v1'
)


# stream PhysicsSpecialRandom0

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsSpecialRandom0_datasetSpecialRandom0_selector
Expand Down
8 changes: 4 additions & 4 deletions HLTrigger/Configuration/python/Tools/confdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ def overrideOutput(self):
'keep l1tTauBXVector_*_Tau_*',
)
)
%(process)s.MinimalOutput = cms.FinalPath( %(process)s.hltOutputMinimal )
%(process)s.MinimalOutput = cms.EndPath( %(process)s.hltOutputMinimal )
%(process)s.schedule.append( %(process)s.MinimalOutput )
"""
elif not self.config.fragment and self.config.output == 'full':
Expand All @@ -531,7 +531,7 @@ def overrideOutput(self):
),
outputCommands = cms.untracked.vstring( 'keep *' )
)
%(process)s.FullOutput = cms.FinalPath( %(process)s.hltOutputFull )
%(process)s.FullOutput = cms.EndPath( %(process)s.hltOutputFull )
%(process)s.schedule.append( %(process)s.FullOutput )
"""

Expand Down Expand Up @@ -712,14 +712,14 @@ def instrumentDQM(self):
other_path = re.compile(r'(.*\b(process\.)?DQMOutput = cms\.(Final|End)Path\()(.*)')
if empty_path.search(self.data):
# replace an empty DQMOutput path
self.data = empty_path.sub(dqmstore + '\n%(process)s.DQMOutput = cms.FinalPath( %(process)s.dqmOutput )\n', self.data)
self.data = empty_path.sub(dqmstore + '\n%(process)s.DQMOutput = cms.EndPath( %(process)s.dqmOutput )\n', self.data)
elif other_path.search(self.data):
# prepend the dqmOutput to the DQMOutput path
self.data = other_path.sub(dqmstore + r'\g<1> %(process)s.dqmOutput +\g<4>', self.data)
else:
# create a new DQMOutput path with the dqmOutput module
self.data += dqmstore
self.data += '\n%(process)s.DQMOutput = cms.FinalPath( %(process)s.dqmOutput )\n'
self.data += '\n%(process)s.DQMOutput = cms.EndPath( %(process)s.dqmOutput )\n'
self.data += '%(process)s.schedule.append( %(process)s.DQMOutput )\n'


Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/GRun.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ DQM_PixelReconstruction_v* # CMSHLT-2287, CMSHLT-2316, CMSHLT-2696, CMSHLT-2720,
DQM_EcalReconstruction_v* # CMSHLT-2287, CMSHLT-2696, CMSHLT-2720, CMSHLT-2862
DQM_HcalReconstruction_v* # CMSHLT-2287, CMSHLT-2696, CMSHLT-2720

## EndPaths / FinalPaths ##
## EndPaths ##

PhysicsCommissioningOutput
PhysicsDispJetBTagMuEGTauOutput # CMSHLT-2431
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/HIon.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ HLT_HIUPC_HFafterglowCombined_v* # CMSHLT-3335

HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

ALCAP0Output
ALCAPHISYMOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/PRef.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ HLT_PPRefUPC_SingleJet28_ZDC1nOR_v* # CMSHLT-3325
HLT_PPRefUPC_ZDC1nAsymXOR_v* # CMSHLT-3325
HLT_PPRefUPC_ZDC1nOR_v* # CMSHLT-3325

## EndPaths / FinalPaths ##
## EndPaths ##

ALCAP0Output
ALCAPHISYMOutput
Expand Down
7 changes: 6 additions & 1 deletion HLTrigger/Configuration/tables/Special.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ HLT_L1ETM120_v* # CMSHLT-2860
HLT_L1ETM150_v* # CMSHLT-2860
HLT_L1EXT_HCAL_LaserMon1_v* # CMSHLT-2860
HLT_L1EXT_HCAL_LaserMon4_v* # CMSHLT-2860
HLT_L1MinimumBiasHF0ANDBptxAND_v* # CMSHLT-3427
HLT_CscCluster_Cosmic_v* # CMSHLT-2860
HLT_EcalCalibration_v* # CMSHLT-2860
HLT_HcalCalibration_v* # CMSHLT-2860
Expand All @@ -68,6 +69,7 @@ HLT_HcalPhiSym_v* # CMSHLT-2860
HLT_HT60_Beamspot_v* # CMSHLT-2860
HLT_HT300_Beamspot_v* # CMSHLT-2860
HLT_HT300_Beamspot_PixelClusters_WP2_v* # CMSHLT-2860
HLT_PixelClusters_WP2_HighRate_v* # CMSHLT-3427
HLT_PixelClusters_WP2_v* # CMSHLT-2860
HLT_PixelClusters_WP1_v* # CMSHLT-2860
HLT_IsoTrackHB_v* # CMSHLT-2860
Expand Down Expand Up @@ -109,7 +111,7 @@ AlCa_LumiPixelsCounts_ZeroBias_v* # CMSHLT-3092
HLT_CDC_L2cosmic_5p5_er1p0_v* # CMSHLT-3092
HLT_CDC_L2cosmic_10_er1p0_v* # CMSHLT-3092

## EndPaths / FinalPaths ##
## EndPaths ##

ALCALumiPixelsCountsExpressOutput
ALCALumiPixelsCountsGatedOutput
Expand Down Expand Up @@ -139,6 +141,9 @@ HLTMonitorOutput # CMSHLT-3092
NanoDSTOutput
PhysicsCommissioningOutput

PhysicsSpecialMinimumBias0Output # CMSHLT-3427
PhysicsSpecialMinimumBias1Output # CMSHLT-3427

PhysicsSpecialHLTPhysics0Output
PhysicsSpecialHLTPhysics1Output
PhysicsSpecialHLTPhysics2Output
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_Circulating.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ DQM_HcalReconstruction_v*

HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

CalibrationOutput
DQMOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_Cosmics.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ HLT_L1EXT_HCAL_LaserMon4_v*

HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

PhysicsCommissioningOutput
ExpressCosmicsOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_ECAL.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ HLT_SpecialHLTPhysics_v*
HLT_Physics_v* # CMSHLT-3210
HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

ALCALumiPixelsCountsExpressOutput
ALCALumiPixelsCountsPromptOutput
Expand Down
17 changes: 10 additions & 7 deletions HLTrigger/Configuration/tables/online_FirstCollisions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,19 @@ HLT_ZeroBias_IsolatedBunches_v*
HLT_ZeroBias_LastCollisionInTrain_v*
HLT_ZeroBias_v*
HLT_SpecialZeroBias_v*
HLT_L1MinimumBiasHF0ANDBptxAND_v* # CMSHLT-3427
HLT_PixelClusters_WP1_v*
HLT_PixelClusters_WP2_v*
HLT_HT300_Beamspot_PixelClusters_WP2_v*
HLT_PixelClusters_WP2_HighRate_v* # CMSHLT-3427

DQM_EcalReconstruction_v*
DQM_HcalReconstruction_v*
DQM_PixelReconstruction_v*

HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

ALCALumiPixelsCountsExpressOutput
ALCALumiPixelsCountsPromptOutput
Expand Down Expand Up @@ -68,12 +77,6 @@ PhysicsSpecialZeroBias8Output
PhysicsSpecialZeroBias9Output
NanoDSTOutput
RPCMONOutput
HLT_PixelClusters_WP1_v*
HLT_PixelClusters_WP2_v*
HLT_HT300_Beamspot_PixelClusters_WP2_v*
DQM_EcalReconstruction_v*
DQM_HcalReconstruction_v*
DQM_PixelReconstruction_v*
DQMGPUvsCPUOutput

######## Paths that are different between online and offline ########
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_LumiScan.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ HLT_L1SingleMuCosmics_EMTF_v*
HLT_Physics_v* # CMSHLT-3210
HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

ALCALumiPixelsCountsExpressOutput
ALCALumiPixelsCountsGatedOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_PPS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ HLT_HT300_Beamspot_PixelClusters_WP2_v*

HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

ALCALumiPixelsCountsExpressOutput
ALCALumiPixelsCountsPromptOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_Special.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ AlCa_LumiPixelsCounts_ZeroBias_v* # CMSHLT-3092
HLT_CDC_L2cosmic_5p5_er1p0_v* # CMSHLT-3092
HLT_CDC_L2cosmic_10_er1p0_v* # CMSHLT-3092

## EndPaths / FinalPaths ##
## EndPaths ##

ALCALumiPixelsCountsExpressOutput
ALCALumiPixelsCountsGatedOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_Splashes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Status_OnGPU # CMSHLT3186

HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

DQMOutput
DQMEventDisplayOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_TrackerVR.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Status_OnGPU # CMSHLT-3186

HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

PhysicsVRRandom0Output # CMSHLT-3405
PhysicsVRRandom1Output
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_grun.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ DQM_PixelReconstruction_v* # CMSHLT-2287, CMSHLT-2316, CMSHLT-2696, CMSHLT-2720,
DQM_EcalReconstruction_v* # CMSHLT-2287, CMSHLT-2696, CMSHLT-2720, CMSHLT-2862
DQM_HcalReconstruction_v* # CMSHLT-2287, CMSHLT-2696, CMSHLT-2720

## EndPaths / FinalPaths ##
## EndPaths ##

PhysicsCommissioningOutput
PhysicsDispJetBTagMuEGTauOutput # CMSHLT-2431
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 @@ -270,7 +270,7 @@ HLT_HIUPC_HFafterglowCombined_v* # CMSHLT-3335

HLTriggerFinalPath

## EndPaths / FinalPaths ##
## EndPaths ##

ALCAP0Output
ALCAPHISYMOutput
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/online_pref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ HLT_PPRefUPC_SingleJet28_ZDC1nOR_v* # CMSHLT-3325
HLT_PPRefUPC_ZDC1nAsymXOR_v* # CMSHLT-3325
HLT_PPRefUPC_ZDC1nOR_v* # CMSHLT-3325

## EndPaths / FinalPaths ##
## EndPaths ##

ALCAP0Output
ALCAPHISYMOutput
Expand Down
Loading