Skip to content

Commit 6aae8dc

Browse files
authored
Merge pull request #45160 from cms-tsg-storm/HLTdevelopment140X_for141X
HLT menu development for `14_0_X` (8/N) [`14_1_X`]
2 parents 4639c10 + 6de0ecf commit 6aae8dc

33 files changed

+27758
-24062
lines changed

Configuration/HLT/python/autoCondHLT.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
2121
'FULL' : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
2222
'GRun' : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
23-
'2024v12' : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
23+
'2024v13' : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
2424
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2023_v1_1_5_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-10-24 16:59:55.000"] ), ),
2525
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
2626
'PRef' : ( ','.join( [ 'L1Menu_CollisionsPPRef2023_v1_1_2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-09-21 19:00:00.000"] ), ),
@@ -37,7 +37,7 @@
3737
'run2_mc_Fake2' : ('run2_mc' ,l1Menus['Fake2']),
3838
'run3_mc_FULL' : ('phase1_2024_realistic' ,l1Menus['FULL']),
3939
'run3_mc_GRun' : ('phase1_2024_realistic' ,l1Menus['GRun']),
40-
'run3_mc_2024v12' : ('phase1_2024_realistic' ,l1Menus['2024v12']),
40+
'run3_mc_2024v13' : ('phase1_2024_realistic' ,l1Menus['2024v13']),
4141
'run3_mc_HIon' : ('phase1_2023_realistic_hi',l1Menus['HIon']),
4242
'run3_mc_PIon' : ('phase1_2024_realistic' ,l1Menus['PIon']),
4343
'run3_mc_PRef' : ('phase1_2024_realistic' ,l1Menus['PRef']),
@@ -49,7 +49,7 @@
4949
'run2_hlt_Fake2' : ('run2_hlt_relval' ,l1Menus['Fake2']),
5050
'run3_hlt_FULL' : ('run3_hlt' ,l1Menus['FULL']),
5151
'run3_hlt_GRun' : ('run3_hlt' ,l1Menus['GRun']),
52-
'run3_hlt_2024v12' : ('run3_hlt' ,l1Menus['2024v12']),
52+
'run3_hlt_2024v13' : ('run3_hlt' ,l1Menus['2024v13']),
5353
'run3_hlt_HIon' : ('run3_hlt' ,l1Menus['HIon']),
5454
'run3_hlt_PIon' : ('run3_hlt' ,l1Menus['PIon']),
5555
'run3_hlt_PRef' : ('run3_hlt' ,l1Menus['PRef']),
@@ -61,7 +61,7 @@
6161
'run2_data_Fake2' : ('run2_data' ,l1Menus['Fake2']),
6262
'run3_data_FULL' : ('run3_data_prompt' ,l1Menus['FULL']),
6363
'run3_data_GRun' : ('run3_data_prompt' ,l1Menus['GRun']),
64-
'run3_data_2024v12' : ('run3_data_prompt' ,l1Menus['2024v12']),
64+
'run3_data_2024v13' : ('run3_data_prompt' ,l1Menus['2024v13']),
6565
'run3_data_HIon' : ('run3_data_prompt' ,l1Menus['HIon']),
6666
'run3_data_PIon' : ('run3_data_prompt' ,l1Menus['PIon']),
6767
'run3_data_PRef' : ('run3_data_prompt' ,l1Menus['PRef']),

HLTrigger/Configuration/python/HLT_2024v12_cff.py renamed to HLTrigger/Configuration/python/HLT_2024v13_cff.py

Lines changed: 4137 additions & 3611 deletions
Large diffs are not rendered by default.

HLTrigger/Configuration/python/HLT_FULL_cff.py

Lines changed: 4320 additions & 3776 deletions
Large diffs are not rendered by default.

HLTrigger/Configuration/python/HLT_GRun_cff.py

Lines changed: 4134 additions & 3608 deletions
Large diffs are not rendered by default.

HLTrigger/Configuration/python/HLT_HIon_cff.py

Lines changed: 69 additions & 44 deletions
Large diffs are not rendered by default.

HLTrigger/Configuration/python/HLT_PIon_cff.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hltGetConfiguration /dev/CMSSW_14_0_0/PIon --cff --data --type PIon
22

3-
# /dev/CMSSW_14_0_0/PIon/V124 (CMSSW_14_0_6)
3+
# /dev/CMSSW_14_0_0/PIon/V141 (CMSSW_14_0_6)
44

55
import FWCore.ParameterSet.Config as cms
66

@@ -9,7 +9,7 @@
99
fragment.load("Configuration.StandardSequences.Accelerators_cff")
1010

1111
fragment.HLTConfigVersion = cms.PSet(
12-
tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V124")
12+
tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V141")
1313
)
1414

1515
fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet(
@@ -3608,10 +3608,6 @@
36083608
offset = cms.uint32( 0 ),
36093609
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" )
36103610
)
3611-
fragment.hltFEDSelectorTCDS = cms.EDProducer( "EvFFEDSelector",
3612-
inputTag = cms.InputTag( "rawDataCollector" ),
3613-
fedList = cms.vuint32( 1024, 1025 )
3614-
)
36153611
fragment.hltTriggerSummaryAOD = cms.EDProducer( "TriggerSummaryProducerAOD",
36163612
throw = cms.bool( False ),
36173613
processName = cms.string( "@" ),
@@ -3695,7 +3691,7 @@
36953691
fragment.HLT_Random_v3 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPreRandom + fragment.HLTEndSequence )
36963692
fragment.HLT_Physics_v12 = cms.Path( fragment.HLTBeginSequenceL1Fat + fragment.hltPrePhysics + fragment.HLTEndSequence )
36973693
fragment.HLT_ZeroBias_v11 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sZeroBias + fragment.hltPreZeroBias + fragment.HLTEndSequence )
3698-
fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltFEDSelectorTCDS + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
3694+
fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
36993695
fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltL1TGlobalSummary + fragment.hltTrigReport )
37003696
fragment.Dataset_HLTPhysics = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetHLTPhysics + fragment.hltPreDatasetHLTPhysics )
37013697
fragment.Dataset_OnlineMonitor = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetOnlineMonitor + fragment.hltPreDatasetOnlineMonitor )

0 commit comments

Comments
 (0)