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_5_X (2/N) [12_6_X] #40154

Merged
merged 3 commits into from Nov 28, 2022
Merged

HLT menu development for 12_5_X (2/N) [12_6_X] #40154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d9b37
HLT menu development for 12_5_X (branch: 12_6_X)
missirol Nov 25, 2022
f755255
Update of L1T menu in TSG GTs to L1Menu_Collisions2022_v1_4_0-d1_xml
missirol Nov 25, 2022
6dfd362
Use frozen 2022-V1.5 pp HLT menu for 2022 RelVal wfs
missirol Nov 25, 2022
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
4 changes: 2 additions & 2 deletions Configuration/HLT/python/autoCondHLT.py
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2022_v1_4_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-11-22 09:57:54.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2022_v1_4_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-11-22 09:57:54.000"] ), ),
'2022v15' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2022_v1_1_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-10-26 10:46:29.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
Expand Down
2 changes: 1 addition & 1 deletion Configuration/HLT/python/autoHLT.py
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
'relval2016' : 'Fake2',
'relval2017' : 'Fake2',
'relval2018' : 'Fake2',
'relval2022' : 'GRun',
'relval2022' : '2022v15',
'relval2026' : '75e33',
'test' : 'GRun',
}
12 changes: 6 additions & 6 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file
Open in desktop
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_5_0/GRun --type GRun
# hltGetConfiguration /dev/CMSSW_12_5_0/GRun --cff --data --type GRun

# /dev/CMSSW_12_5_0/GRun/V16 (CMSSW_12_5_2)
# /dev/CMSSW_12_5_0/GRun/V17 (CMSSW_12_5_2)

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_5_0/GRun/V16')
tableName = cms.string('/dev/CMSSW_12_5_0/GRun/V17')
)

fragment.transferSystem = cms.PSet(
Expand Down
12 changes: 6 additions & 6 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
Open in desktop
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_5_0/PIon --type PIon
# hltGetConfiguration /dev/CMSSW_12_5_0/PIon --cff --data --type PIon

# /dev/CMSSW_12_5_0/PIon/V16 (CMSSW_12_5_2)
# /dev/CMSSW_12_5_0/PIon/V17 (CMSSW_12_5_2)

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_5_0/PIon/V16')
tableName = cms.string('/dev/CMSSW_12_5_0/PIon/V17')
)

fragment.transferSystem = cms.PSet(
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file
Open in desktop
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_5_0/PRef --type PRef
# hltGetConfiguration /dev/CMSSW_12_5_0/PRef --cff --data --type PRef

# /dev/CMSSW_12_5_0/PRef/V16 (CMSSW_12_5_2)
# /dev/CMSSW_12_5_0/PRef/V17 (CMSSW_12_5_2)

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_5_0/PRef/V16')
tableName = cms.string('/dev/CMSSW_12_5_0/PRef/V17')
)

fragment.transferSystem = cms.PSet(
Expand Down
24 changes: 0 additions & 24 deletions HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py
View file
Open in desktop
Expand Up @@ -141,13 +141,9 @@
'keep *_hltDoublePFTauTightIso45Track5_*_*',
'keep *_hltDoublePFTauTightIso45Track_*_*',
'keep *_hltDt4DSegments_*_*',
'keep *_hltEcalDigisFromGPU_*_*',
'keep *_hltEcalDigisLegacy_*_*',
'keep *_hltEcalPhiSymFilter_*_*',
'keep *_hltEcalRecHitAll_*_*',
'keep *_hltEcalRecHit_*_*',
'keep *_hltEcalUncalibRecHitFromSoA_*_*',
'keep *_hltEcalUncalibRecHitLegacy_*_*',
'keep *_hltEgammaCandidates_*_*',
'keep *_hltEgammaGsfElectrons_*_*',
'keep *_hltEgammaGsfTracks_*_*',
Expand Down Expand Up @@ -182,8 +178,6 @@
'keep *_hltHISiPixelClusters_*_*',
'keep *_hltHITIPTCorrectorHB_*_*',
'keep *_hltHITIPTCorrectorHE_*_*',
'keep *_hltHbherecoFromGPU_*_*',
'keep *_hltHbherecoLegacy_*_*',
'keep *_hltHbhereco_*_*',
'keep *_hltHfreco_*_*',
'keep *_hltHiCorrectedIslandBarrelSuperClustersHI_*_*',
Expand Down Expand Up @@ -309,11 +303,7 @@
'keep *_hltParticleFlow_*_*',
'keep *_hltParticleNetDiscriminatorsJetTagsAK8_*_*',
'keep *_hltParticleNetDiscriminatorsJetTags_*_*',
'keep *_hltPixelTracksCPU_*_*',
'keep *_hltPixelTracksFromGPU_*_*',
'keep *_hltPixelTracks_*_*',
'keep *_hltPixelVerticesCPU_*_*',
'keep *_hltPixelVerticesFromGPU_*_*',
'keep *_hltPixelVertices_*_*',
'keep *_hltRecoEcalSuperClusterActivityCandidateSC4_*_*',
'keep *_hltRecoEcalSuperClusterActivityCandidateSC5_*_*',
Expand All @@ -325,8 +315,6 @@
'keep *_hltSiPixelCluster_*_*',
'keep *_hltSiPixelClustersCache_*_*',
'keep *_hltSiPixelClusters_*_*',
'keep *_hltSiPixelRecHitsFromLegacy_*_*',
'keep *_hltSiPixelRecHitsSoAFromGPU_*_*',
'keep *_hltSiStripClusterizerForRawPrime_*_*',
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep *_hltSiStripClusters_*_*',
Expand Down Expand Up @@ -484,13 +472,9 @@
'keep *_hltDoublePFTauTightIso45Track5_*_*',
'keep *_hltDoublePFTauTightIso45Track_*_*',
'keep *_hltDt4DSegments_*_*',
'keep *_hltEcalDigisFromGPU_*_*',
'keep *_hltEcalDigisLegacy_*_*',
'keep *_hltEcalPhiSymFilter_*_*',
'keep *_hltEcalRecHitAll_*_*',
'keep *_hltEcalRecHit_*_*',
'keep *_hltEcalUncalibRecHitFromSoA_*_*',
'keep *_hltEcalUncalibRecHitLegacy_*_*',
'keep *_hltEgammaCandidates_*_*',
'keep *_hltEgammaGsfElectrons_*_*',
'keep *_hltEgammaGsfTracks_*_*',
Expand Down Expand Up @@ -525,8 +509,6 @@
'keep *_hltHISiPixelClusters_*_*',
'keep *_hltHITIPTCorrectorHB_*_*',
'keep *_hltHITIPTCorrectorHE_*_*',
'keep *_hltHbherecoFromGPU_*_*',
'keep *_hltHbherecoLegacy_*_*',
'keep *_hltHbhereco_*_*',
'keep *_hltHfreco_*_*',
'keep *_hltHiCorrectedIslandBarrelSuperClustersHI_*_*',
Expand Down Expand Up @@ -652,11 +634,7 @@
'keep *_hltParticleFlow_*_*',
'keep *_hltParticleNetDiscriminatorsJetTagsAK8_*_*',
'keep *_hltParticleNetDiscriminatorsJetTags_*_*',
'keep *_hltPixelTracksCPU_*_*',
'keep *_hltPixelTracksFromGPU_*_*',
'keep *_hltPixelTracks_*_*',
'keep *_hltPixelVerticesCPU_*_*',
'keep *_hltPixelVerticesFromGPU_*_*',
'keep *_hltPixelVertices_*_*',
'keep *_hltRecoEcalSuperClusterActivityCandidateSC4_*_*',
'keep *_hltRecoEcalSuperClusterActivityCandidateSC5_*_*',
Expand All @@ -668,8 +646,6 @@
'keep *_hltSiPixelCluster_*_*',
'keep *_hltSiPixelClustersCache_*_*',
'keep *_hltSiPixelClusters_*_*',
'keep *_hltSiPixelRecHitsFromLegacy_*_*',
'keep *_hltSiPixelRecHitsSoAFromGPU_*_*',
'keep *_hltSiStripClusterizerForRawPrime_*_*',
'keep *_hltSiStripClusters2ApproxClusters_*_*',
'keep *_hltSiStripClusters_*_*',
Expand Down
14 changes: 8 additions & 6 deletions HLTrigger/Configuration/test/OnLine_HLT_FULL.py
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions HLTrigger/Configuration/test/OnLine_HLT_GRun.py
View file
Open in desktop
@@ -1,6 +1,6 @@
# hltGetConfiguration --full --data /dev/CMSSW_12_5_0/GRun --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root
# hltGetConfiguration /dev/CMSSW_12_5_0/GRun --full --data --type GRun --unprescale --process HLTGRun --globaltag auto:run3_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root

# /dev/CMSSW_12_5_0/GRun/V16 (CMSSW_12_5_2)
# /dev/CMSSW_12_5_0/GRun/V17 (CMSSW_12_5_2)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,7 +12,7 @@
process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_5_0/GRun/V16')
tableName = cms.string('/dev/CMSSW_12_5_0/GRun/V17')
)

process.transferSystem = cms.PSet(
Expand Down
14 changes: 8 additions & 6 deletions HLTrigger/Configuration/test/OnLine_HLT_HIon.py
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions HLTrigger/Configuration/test/OnLine_HLT_PIon.py
View file
Open in desktop
@@ -1,6 +1,6 @@
# hltGetConfiguration --full --data /dev/CMSSW_12_5_0/PIon --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root
# hltGetConfiguration /dev/CMSSW_12_5_0/PIon --full --data --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root

# /dev/CMSSW_12_5_0/PIon/V16 (CMSSW_12_5_2)
# /dev/CMSSW_12_5_0/PIon/V17 (CMSSW_12_5_2)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,7 +12,7 @@
process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_5_0/PIon/V16')
tableName = cms.string('/dev/CMSSW_12_5_0/PIon/V17')
)

process.transferSystem = cms.PSet(
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/test/OnLine_HLT_PRef.py
View file
Open in desktop
@@ -1,6 +1,6 @@
# hltGetConfiguration --full --data /dev/CMSSW_12_5_0/PRef --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root
# hltGetConfiguration /dev/CMSSW_12_5_0/PRef --full --data --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root

# /dev/CMSSW_12_5_0/PRef/V16 (CMSSW_12_5_2)
# /dev/CMSSW_12_5_0/PRef/V17 (CMSSW_12_5_2)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,7 +12,7 @@
process.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_5_0/PRef/V16')
tableName = cms.string('/dev/CMSSW_12_5_0/PRef/V17')
)

process.transferSystem = cms.PSet(
Expand Down
9 changes: 2 additions & 7 deletions HLTrigger/Configuration/test/getEventContent.py
View file
Open in desktop
Expand Up @@ -120,7 +120,6 @@ def printHLTriggerEventContentCff(process):
'hltOutputA',
'hltOutputPhysicsCommissioning',
'hltOutputDQM',
'hltOutputDQMGPUvsCPU',
'hltOutputHLTMonitor',
'hltOutputReleaseValidation',
],
Expand All @@ -140,18 +139,15 @@ def printHLTriggerEventContentCff(process):
hltOutputMON_cff.block_hltOutputA = hltOutputMON_cff.block_hltOutputPhysicsCommissioning
if not hasattr(hltOutputMON_cff,'block_hltOutputDQM'):
hltOutputMON_cff.block_hltOutputDQM = cms.PSet(outputCommands = cms.untracked.vstring( 'drop *' ))
if not hasattr(hltOutputMON_cff,'block_hltOutputDQMGPUvsCPU'):
hltOutputMON_cff.block_hltOutputDQMGPUvsCPU = cms.PSet(outputCommands = cms.untracked.vstring( 'drop *' ))
if not hasattr(hltOutputMON_cff,'block_hltOutputHLTMonitor'):
hltOutputMON_cff.block_hltOutputHLTMonitor = cms.PSet(outputCommands = cms.untracked.vstring( 'drop *_hlt*_*_*' ))
if not hasattr(hltOutputMON_cff,'block_hltOutputReleaseValidation'):
hltOutputMON_cff.block_hltOutputReleaseValidation = cms.PSet(outputCommands = cms.untracked.vstring( 'drop *' ))

hltDebugOutputBlocks = (
# the DQM, DQMGPUvsCPU and HLTMON streams have the HLT debug outputs used online
# the DQM and HLTMON streams have the HLT debug outputs used online
hltOutputMON_cff.block_hltOutputA.outputCommands,
hltOutputMON_cff.block_hltOutputDQM.outputCommands,
hltOutputMON_cff.block_hltOutputDQMGPUvsCPU.outputCommands,
hltOutputMON_cff.block_hltOutputHLTMonitor.outputCommands,
hltOutputMON_cff.block_hltOutputReleaseValidation.outputCommands,
)
Expand All @@ -174,10 +170,9 @@ def printHLTriggerEventContentCff(process):
if not hasattr(hltOutputALCA_cff,'block_hltOutputRPCMON'):
hltOutputALCA_cff.block_hltOutputRPCMON = cms.PSet(outputCommands = cms.untracked.vstring( 'drop *' ))
hltDebugWithAlCaOutputBlocks = (
# the DQM, DQMGPUvsCPU and HLTMON streams have the HLT debug outputs used online
# the DQM and HLTMON streams have the HLT debug outputs used online
hltOutputMON_cff.block_hltOutputA.outputCommands,
hltOutputMON_cff.block_hltOutputDQM.outputCommands,
hltOutputMON_cff.block_hltOutputDQMGPUvsCPU.outputCommands,
hltOutputMON_cff.block_hltOutputHLTMonitor.outputCommands,
hltOutputMON_cff.block_hltOutputReleaseValidation.outputCommands,
# the ALCA streams have the AlCa outputs
Expand Down