Skip to content

Commit ef7ac18

Browse files
cmsbuildcmsbuild
authored
Merge pull request #44948 from cms-tsg-storm/HLTdevelopment140X_for141X
HLT menu development for `14_0_X` (7/N) [`14_1_X`]
2 parents 22f751f + b7613df commit ef7ac18

39 files changed

+27941
-21838
lines changed

‎Configuration/HLT/python/autoCondHLT.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
1919
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
2020
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
21-
'FULL' : ( ','.join( [ 'L1Menu_Collisions2024_v1_1_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-20 12:00:00.000"] ), ),
22-
'GRun' : ( ','.join( [ 'L1Menu_Collisions2024_v1_1_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-20 12:00:00.000"] ), ),
23-
'2024v11' : ( ','.join( [ 'L1Menu_Collisions2024_v1_1_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-20 12:00:00.000"] ), ),
21+
'FULL' : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
22+
'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"] ), ),
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"] ), ),
27-
'Special' : ( ','.join( [ 'L1Menu_Collisions2024_v1_1_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-20 12:00:00.000"] ), ),
27+
'Special' : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
2828
}
2929

3030
hltGTs = {
@@ -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_2024v11' : ('phase1_2024_realistic' ,l1Menus['2024v11']),
40+
'run3_mc_2024v12' : ('phase1_2024_realistic' ,l1Menus['2024v12']),
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_2024v11' : ('run3_hlt' ,l1Menus['2024v11']),
52+
'run3_hlt_2024v12' : ('run3_hlt' ,l1Menus['2024v12']),
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_2024v11' : ('run3_data_prompt' ,l1Menus['2024v11']),
64+
'run3_data_2024v12' : ('run3_data_prompt' ,l1Menus['2024v12']),
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_2024v11_cff.py renamed to HLTrigger/Configuration/python/HLT_2024v12_cff.py

Lines changed: 4226 additions & 3283 deletions
Large diffs are not rendered by default.

‎HLTrigger/Configuration/python/HLT_FULL_cff.py‎

Lines changed: 4328 additions & 3389 deletions
Large diffs are not rendered by default.

‎HLTrigger/Configuration/python/HLT_Fake1_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# hltGetConfiguration /dev/CMSSW_14_0_0/Fake1 --cff --data --type Fake1
22

3-
# /dev/CMSSW_14_0_0/Fake1/V14 (CMSSW_14_0_5)
3+
# /dev/CMSSW_14_0_0/Fake1/V15 (CMSSW_14_0_6)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99
fragment.HLTConfigVersion = cms.PSet(
10-
tableName = cms.string("/dev/CMSSW_14_0_0/Fake1/V14")
10+
tableName = cms.string("/dev/CMSSW_14_0_0/Fake1/V15")
1111
)
1212

1313
fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )

‎HLTrigger/Configuration/python/HLT_Fake2_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# hltGetConfiguration /dev/CMSSW_14_0_0/Fake2 --cff --data --type Fake2
22

3-
# /dev/CMSSW_14_0_0/Fake2/V14 (CMSSW_14_0_5)
3+
# /dev/CMSSW_14_0_0/Fake2/V15 (CMSSW_14_0_6)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99
fragment.HLTConfigVersion = cms.PSet(
10-
tableName = cms.string("/dev/CMSSW_14_0_0/Fake2/V14")
10+
tableName = cms.string("/dev/CMSSW_14_0_0/Fake2/V15")
1111
)
1212

1313
fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )

‎HLTrigger/Configuration/python/HLT_Fake_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# hltGetConfiguration /dev/CMSSW_14_0_0/Fake --cff --data --type Fake
22

3-
# /dev/CMSSW_14_0_0/Fake/V14 (CMSSW_14_0_5)
3+
# /dev/CMSSW_14_0_0/Fake/V15 (CMSSW_14_0_6)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99
fragment.HLTConfigVersion = cms.PSet(
10-
tableName = cms.string("/dev/CMSSW_14_0_0/Fake/V14")
10+
tableName = cms.string("/dev/CMSSW_14_0_0/Fake/V15")
1111
)
1212

1313
fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )

0 commit comments

Comments
 (0)