Skip to content

Commit e876c42

Browse files
mmusichmmusich
committed
Introduce 2024v1.3 frozen menu and remove 2024v1.2
1 parent 1179aab commit e876c42

File tree

9 files changed

+8310
-7250
lines changed

9 files changed

+8310
-7250
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/Tools/options.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'PRef' : 'auto:run3_mc_PRef',
1111
'Special' : 'auto:run3_mc_GRun', # same as GRun
1212
'data' : 'auto:run3_hlt_relval',
13-
'2024v12' : 'auto:run3_mc_2024v12',
13+
'2024v13' : 'auto:run3_mc_2024v13',
1414
}
1515

1616

‎HLTrigger/Configuration/tables/makeOnlineGRun‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
MASTER="/dev/CMSSW_14_0_0/HLT" # no version, take the latest one
7-
TARGET="/online/collisions/2024/2e34/v1.2/HLT" # where to store the online-compliant menu
7+
TARGET="/online/collisions/2024/2e34/v1.3/HLT" # where to store the online-compliant menu
88
PREFIX=""
99
TABLES="online_grun"
1010

HLTrigger/Configuration/test/OnLine_HLT_2024v12.py renamed to HLTrigger/Configuration/test/OnLine_HLT_2024v13.py

Lines changed: 4156 additions & 3622 deletions
Large diffs are not rendered by default.

‎HLTrigger/Configuration/test/cmsDriver.csh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ foreach gtag ( MC DATA )
136136
if ( $1 == "" ) then
137137
set tables = ( GRun )
138138
else if ( ($1 == all) || ($1 == ALL) ) then
139-
set tables = ( GRun HIon PIon PRef Special 2024v12 Fake Fake1 Fake2 )
139+
set tables = ( GRun HIon PIon PRef Special 2024v13 Fake Fake1 Fake2 )
140140
else if ( ($1 == ib) || ($1 == IB) ) then
141141
set tables = ( GRun HIon PIon PRef Special )
142142
else if ( ($1 == dev) || ($1 == DEV) ) then
@@ -146,7 +146,7 @@ foreach gtag ( MC DATA )
146146
else if ( ($1 == fake) || ($1 == FAKE) ) then
147147
set tables = ( Fake Fake1 Fake2 )
148148
else if ( ($1 == frozen) || ($1 == FROZEN) ) then
149-
set tables = ( 2024v12 )
149+
set tables = ( 2024v13 )
150150
else
151151
set tables = ( $1 )
152152
endif
@@ -220,11 +220,11 @@ foreach gtag ( MC DATA )
220220
set Custom = " "
221221
set L1REPACK = L1REPACK:Full
222222
set DIGI = DIGI:pdigi
223-
else if ( $table == 2024v12 ) then
223+
else if ( $table == 2024v13 ) then
224224
set XL1T = $XL1TPP3
225-
set XHLT = HLT:2024v12
226-
set GTAG = ${BASE3}_2024v12
227-
set RTAG = ${RECO3}_2024v12
225+
set XHLT = HLT:2024v13
226+
set GTAG = ${BASE3}_2024v13
227+
set RTAG = ${RECO3}_2024v13
228228
set NN = $NNPP
229229
set SCEN = pp
230230
set InputGenSim = $InputGenSimGRun3

‎HLTrigger/Configuration/test/getFrozenHLT.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ declare -A TABLES=(
1212
["Fake"]="/dev/CMSSW_14_0_0/Fake"
1313
["Fake1"]="/dev/CMSSW_14_0_0/Fake1"
1414
["Fake2"]="/dev/CMSSW_14_0_0/Fake2"
15-
["2024v12"]="/frozen/2024/2e34/v1.2/HLT"
15+
["2024v13"]="/frozen/2024/2e34/v1.3/HLT"
1616
)
1717

1818
# command-line arguments

‎HLTrigger/Configuration/test/runIntegration.csh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo Starting $0 $1 $2
99
if ( $2 == "" ) then
1010
set tables = ( GRun )
1111
else if ( $2 == ALL ) then
12-
set tables = ( GRun HIon PIon PRef Special 2024v12 Fake Fake1 Fake2 )
12+
set tables = ( GRun HIon PIon PRef Special 2024v13 Fake Fake1 Fake2 )
1313
else if ( $2 == IB ) then
1414
set tables = ( GRun HIon PIon PRef Special)
1515
else if ( $2 == DEV ) then
@@ -19,7 +19,7 @@ else if ( $2 == FULL ) then
1919
else if ( $2 == FAKE ) then
2020
set tables = ( Fake Fake1 Fake2 )
2121
else if ( $2 == FROZEN ) then
22-
set tables = ( 2024v12 )
22+
set tables = ( 2024v13 )
2323
else
2424
set tables = ( $2 )
2525
endif

‎HLTrigger/Configuration/test/runOne.csh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo Starting $0 $1 $2
1212
if ( $2 == "" ) then
1313
set tables = ( GRun )
1414
else if ( ($2 == all) || ($2 == ALL) ) then
15-
set tables = ( GRun HIon PIon PRef 2024v12 Fake Fake1 Fake2 Special)
15+
set tables = ( GRun HIon PIon PRef 2024v13 Fake Fake1 Fake2 Special)
1616
else if ( ($2 == ib) || ($2 == IB) ) then
1717
set tables = ( GRun HIon PIon PRef Special)
1818
else if ( ($2 == dev) || ($2 == DEV) ) then
@@ -22,7 +22,7 @@ else if ( ($2 == full) || ($2 == FULL) ) then
2222
else if ( ($2 == fake) || ($2 == FAKE) ) then
2323
set tables = ( Fake Fake1 Fake2 )
2424
else if ( ($2 == frozen) || ($2 == FROZEN) ) then
25-
set tables = ( 2024v12 )
25+
set tables = ( 2024v13 )
2626
else
2727
set tables = ( $2 )
2828
endif

0 commit comments

Comments
 (0)