Skip to content

Commit

Permalink
HLT menu development for 13_0_X (branch: 13_2_X)
Browse files Browse the repository at this point in the history
Development of HLT menus for `CMSSW_13_0_X`.

This update includes the integration of the following JIRA tickets.

 - [CMSHLT-2841](https://its.cern.ch/jira/browse/CMSHLT-2841): [TSG] cleanup of EventContent of `hltOutputReleaseValidation`
 - [CMSHLT-2844](https://its.cern.ch/jira/browse/CMSHLT-2844): [TSG] remove PSet named `transferSystem`
 - [CMSHLT-2845](https://its.cern.ch/jira/browse/CMSHLT-2845): [TSG] remove `HLT_ExpressMuons_v` trigger
 - [CMSHLT-2846](https://its.cern.ch/jira/browse/CMSHLT-2846): [TRK] add `SiPixelRawDataError` collections to EventContent of `DQMGPUvsCPU` stream
 - [CMSHLT-2847](https://its.cern.ch/jira/browse/CMSHLT-2847): [TSG] add PS column "2p0E34_NoEcalTiming"
 - [CMSHLT-2848](https://its.cern.ch/jira/browse/CMSHLT-2848): [TSG] remove 7 unused PS columns
 - [CMSHLT-2854](https://its.cern.ch/jira/browse/CMSHLT-2854): [L1T] remove outdated L1T seeds for VBF triggers
 - [CMSHLT-2858](https://its.cern.ch/jira/browse/CMSHLT-2858): [L1T] remove extra L1T seeds ahead of `L1TMenu2023-v1_3_0`
 - [CMSHLT-2864](https://its.cern.ch/jira/browse/CMSHLT-2864): [TSG] remove redundant PS columns "1p3E34", "1p0E34", and "0p8E34"
 - [CMSHLT-2870](https://its.cern.ch/jira/browse/CMSHLT-2870): [TSG] set PS=0 for `AlCa_PFJet40_CPUOnly_v` in "2p1E34" PS column
  • Loading branch information
missirol committed Jul 9, 2023
1 parent 239d50b commit deb1b37
Show file tree
Hide file tree
Showing 13 changed files with 72 additions and 1,296 deletions.
118 changes: 11 additions & 107 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

118 changes: 11 additions & 107 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

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

# /dev/CMSSW_13_0_0/HIon/V130 (CMSSW_13_0_2)
# /dev/CMSSW_13_0_0/HIon/V140 (CMSSW_13_0_2)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,86 +12,9 @@
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_13_0_0/HIon/V130')
tableName = cms.string('/dev/CMSSW_13_0_0/HIon/V140')
)

fragment.transferSystem = cms.PSet(
destinations = cms.vstring( 'Tier0',
'DQM',
'ECAL',
'EventDisplay',
'Lustre',
'None' ),
transferModes = cms.vstring( 'default',
'test',
'emulator' ),
streamA = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' )
),
streamCalibration = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamDQM = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamDQMCalibration = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamEcalCalibration = cms.PSet(
default = cms.vstring( 'ECAL' ),
test = cms.vstring( 'ECAL' ),
emulator = cms.vstring( 'None' )
),
streamEventDisplay = cms.PSet(
default = cms.vstring( 'EventDisplay',
'Tier0' ),
test = cms.vstring( 'EventDisplay',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamExpressCosmics = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' )
),
streamNanoDST = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamRPCMON = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamTrackerCalibration = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
default = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' ),
streamLookArea = cms.PSet( )
),
streamLookArea = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
)
)
fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
ComponentType = cms.string( "CkfTrajectoryBuilder" ),
lostHitPenalty = cms.double( 30.0 ),
Expand Down Expand Up @@ -5511,17 +5434,13 @@
PVcomparer = cms.PSet( refToPSet_ = cms.string( "HLTPSetPvClusterComparerForIT" ) )
)
fragment.hltPixelConsumerCPU = cms.EDAnalyzer( "GenericConsumer",
eventProducts = cms.untracked.vstring( 'hltSiPixelRecHitsSoA@cpu',
'hltPixelTracksSoA@cpu',
'hltPixelVerticesSoA@cpu' ),
eventProducts = cms.untracked.vstring( 'hltSiPixelDigis@cpu' ),
lumiProducts = cms.untracked.vstring( ),
runProducts = cms.untracked.vstring( ),
processProducts = cms.untracked.vstring( )
)
fragment.hltPixelConsumerGPU = cms.EDAnalyzer( "GenericConsumer",
eventProducts = cms.untracked.vstring( 'hltSiPixelRecHitsSoA@cuda',
'hltPixelTracksSoA@cuda',
'hltPixelVerticesSoA@cuda' ),
eventProducts = cms.untracked.vstring( 'hltSiPixelDigis@cuda' ),
lumiProducts = cms.untracked.vstring( ),
runProducts = cms.untracked.vstring( ),
processProducts = cms.untracked.vstring( )
Expand Down
81 changes: 2 additions & 79 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration /dev/CMSSW_13_0_0/PIon --cff --data --type PIon

# /dev/CMSSW_13_0_0/PIon/V130 (CMSSW_13_0_2)
# /dev/CMSSW_13_0_0/PIon/V140 (CMSSW_13_0_2)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,86 +12,9 @@
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_13_0_0/PIon/V130')
tableName = cms.string('/dev/CMSSW_13_0_0/PIon/V140')
)

fragment.transferSystem = cms.PSet(
destinations = cms.vstring( 'Tier0',
'DQM',
'ECAL',
'EventDisplay',
'Lustre',
'None' ),
transferModes = cms.vstring( 'default',
'test',
'emulator' ),
streamA = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' )
),
streamCalibration = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamDQM = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamDQMCalibration = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamEcalCalibration = cms.PSet(
default = cms.vstring( 'ECAL' ),
test = cms.vstring( 'ECAL' ),
emulator = cms.vstring( 'None' )
),
streamEventDisplay = cms.PSet(
default = cms.vstring( 'EventDisplay',
'Tier0' ),
test = cms.vstring( 'EventDisplay',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamExpressCosmics = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' )
),
streamNanoDST = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamRPCMON = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamTrackerCalibration = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
default = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' ),
streamLookArea = cms.PSet( )
),
streamLookArea = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
)
)
fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
ComponentType = cms.string( "CkfTrajectoryBuilder" ),
lostHitPenalty = cms.double( 30.0 ),
Expand Down
89 changes: 4 additions & 85 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration /dev/CMSSW_13_0_0/PRef --cff --data --type PRef

# /dev/CMSSW_13_0_0/PRef/V130 (CMSSW_13_0_2)
# /dev/CMSSW_13_0_0/PRef/V140 (CMSSW_13_0_2)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,86 +12,9 @@
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_13_0_0/PRef/V130')
tableName = cms.string('/dev/CMSSW_13_0_0/PRef/V140')
)

fragment.transferSystem = cms.PSet(
destinations = cms.vstring( 'Tier0',
'DQM',
'ECAL',
'EventDisplay',
'Lustre',
'None' ),
transferModes = cms.vstring( 'default',
'test',
'emulator' ),
streamA = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' )
),
streamCalibration = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamDQM = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamDQMCalibration = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamEcalCalibration = cms.PSet(
default = cms.vstring( 'ECAL' ),
test = cms.vstring( 'ECAL' ),
emulator = cms.vstring( 'None' )
),
streamEventDisplay = cms.PSet(
default = cms.vstring( 'EventDisplay',
'Tier0' ),
test = cms.vstring( 'EventDisplay',
'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamExpressCosmics = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' )
),
streamNanoDST = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamRPCMON = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
streamTrackerCalibration = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'None' )
),
default = cms.PSet(
default = cms.vstring( 'Tier0' ),
test = cms.vstring( 'Lustre' ),
emulator = cms.vstring( 'Lustre' ),
streamLookArea = cms.PSet( )
),
streamLookArea = cms.PSet(
default = cms.vstring( 'DQM' ),
test = cms.vstring( 'DQM',
'Lustre' ),
emulator = cms.vstring( 'None' )
)
)
fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
ComponentType = cms.string( "CkfTrajectoryBuilder" ),
lostHitPenalty = cms.double( 30.0 ),
Expand Down Expand Up @@ -5177,17 +5100,13 @@
PVcomparer = cms.PSet( refToPSet_ = cms.string( "HLTPSetPvClusterComparerForIT" ) )
)
fragment.hltPixelConsumerCPU = cms.EDAnalyzer( "GenericConsumer",
eventProducts = cms.untracked.vstring( 'hltSiPixelRecHitsSoA@cpu',
'hltPixelTracksSoA@cpu',
'hltPixelVerticesSoA@cpu' ),
eventProducts = cms.untracked.vstring( 'hltSiPixelDigis@cpu' ),
lumiProducts = cms.untracked.vstring( ),
runProducts = cms.untracked.vstring( ),
processProducts = cms.untracked.vstring( )
)
fragment.hltPixelConsumerGPU = cms.EDAnalyzer( "GenericConsumer",
eventProducts = cms.untracked.vstring( 'hltSiPixelRecHitsSoA@cuda',
'hltPixelTracksSoA@cuda',
'hltPixelVerticesSoA@cuda' ),
eventProducts = cms.untracked.vstring( 'hltSiPixelDigis@cuda' ),
lumiProducts = cms.untracked.vstring( ),
runProducts = cms.untracked.vstring( ),
processProducts = cms.untracked.vstring( )
Expand Down
Loading

0 comments on commit deb1b37

Please sign in to comment.