Skip to content

Commit

Permalink
Introduce 2024v1.0 frozen menu and remove 2023v1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mmusich committed Mar 15, 2024
1 parent 8e75dc3 commit 5f19fd1
Show file tree
Hide file tree
Showing 9 changed files with 80,622 additions and 84,614 deletions.
8 changes: 4 additions & 4 deletions Configuration/HLT/python/autoCondHLT.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2024_v1_0_1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-12 09:00:00.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2024_v1_0_1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-12 09:00:00.000"] ), ),
'2023v12' : ( ','.join( [ 'L1Menu_Collisions2023_v1_2_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-06-13 14:12:00.000"] ), ),
'2024v10' : ( ','.join( [ 'L1Menu_Collisions2024_v1_0_1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-12 09:00:00.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2023_v1_1_5_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-10-24 16:59:55.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_CollisionsPPRef2023_v1_1_2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-09-21 19:00:00.000"] ), ),
Expand All @@ -37,7 +37,7 @@
'run2_mc_Fake2' : ('run2_mc' ,l1Menus['Fake2']),
'run3_mc_FULL' : ('phase1_2024_realistic' ,l1Menus['FULL']),
'run3_mc_GRun' : ('phase1_2024_realistic' ,l1Menus['GRun']),
'run3_mc_2023v12' : ('phase1_2023_realistic' ,l1Menus['2023v12']),
'run3_mc_2024v10' : ('phase1_2024_realistic' ,l1Menus['2024v10']),
'run3_mc_HIon' : ('phase1_2023_realistic_hi',l1Menus['HIon']),
'run3_mc_PIon' : ('phase1_2024_realistic' ,l1Menus['PIon']),
'run3_mc_PRef' : ('phase1_2024_realistic' ,l1Menus['PRef']),
Expand All @@ -49,7 +49,7 @@
'run2_hlt_Fake2' : ('run2_hlt_relval' ,l1Menus['Fake2']),
'run3_hlt_FULL' : ('run3_hlt' ,l1Menus['FULL']),
'run3_hlt_GRun' : ('run3_hlt' ,l1Menus['GRun']),
'run3_hlt_2023v12' : ('run3_hlt' ,l1Menus['2023v12']),
'run3_hlt_2024v10' : ('run3_hlt' ,l1Menus['2024v10']),
'run3_hlt_HIon' : ('run3_hlt' ,l1Menus['HIon']),
'run3_hlt_PIon' : ('run3_hlt' ,l1Menus['PIon']),
'run3_hlt_PRef' : ('run3_hlt' ,l1Menus['PRef']),
Expand All @@ -61,7 +61,7 @@
'run2_data_Fake2' : ('run2_data' ,l1Menus['Fake2']),
'run3_data_FULL' : ('run3_data_prompt' ,l1Menus['FULL']),
'run3_data_GRun' : ('run3_data_prompt' ,l1Menus['GRun']),
'run3_data_2023v12' : ('run3_data_prompt' ,l1Menus['2023v12']),
'run3_data_2024v10' : ('run3_data_prompt' ,l1Menus['2024v10']),
'run3_data_HIon' : ('run3_data_prompt' ,l1Menus['HIon']),
'run3_data_PIon' : ('run3_data_prompt' ,l1Menus['PIon']),
'run3_data_PRef' : ('run3_data_prompt' ,l1Menus['PRef']),
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HLTrigger/Configuration/python/Tools/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'PRef' : 'auto:run3_mc_PRef',
'Special' : 'auto:run3_mc_GRun', # same as GRun
'data' : 'auto:run3_hlt_relval',
'2023v12' : 'auto:run3_mc_2023v12',
'2024v10' : 'auto:run3_mc_2024v10',
}


Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/makeOnlineGRun
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

MASTER="/dev/CMSSW_14_0_0/HLT" # no version, take the latest one
TARGET="/online/collisions/2024/2e34/v0.9/HLT" # where to store the online-compliant menu
TARGET="/online/collisions/2024/2e34/v1.0/HLT" # where to store the online-compliant menu
PREFIX=""
TABLES="online_grun"

Expand Down
101,500 changes: 49,762 additions & 51,738 deletions .../Configuration/test/OnLine_HLT_2023v12.py → .../Configuration/test/OnLine_HLT_2024v10.py

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions HLTrigger/Configuration/test/cmsDriver.csh
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ foreach gtag ( MC DATA )
if ( $1 == "" ) then
set tables = ( GRun )
else if ( ($1 == all) || ($1 == ALL) ) then
set tables = ( GRun HIon PIon PRef Special 2023v12 Fake Fake1 Fake2 )
set tables = ( GRun HIon PIon PRef Special 2024v10 Fake Fake1 Fake2 )
else if ( ($1 == ib) || ($1 == IB) ) then
set tables = ( GRun HIon PIon PRef Special )
else if ( ($1 == dev) || ($1 == DEV) ) then
Expand All @@ -146,7 +146,7 @@ foreach gtag ( MC DATA )
else if ( ($1 == fake) || ($1 == FAKE) ) then
set tables = ( Fake Fake1 Fake2 )
else if ( ($1 == frozen) || ($1 == FROZEN) ) then
set tables = ( 2023v12 )
set tables = ( 2024v10 )
else
set tables = ( $1 )
endif
Expand Down Expand Up @@ -220,11 +220,11 @@ foreach gtag ( MC DATA )
set Custom = " "
set L1REPACK = L1REPACK:Full
set DIGI = DIGI:pdigi
else if ( $table == 2023v12 ) then
else if ( $table == 2024v10 ) then
set XL1T = $XL1TPP3
set XHLT = HLT:2023v12
set GTAG = ${BASE3}_2023v12
set RTAG = ${RECO3}_2023v12
set XHLT = HLT:2024v10
set GTAG = ${BASE3}_2024v10
set RTAG = ${RECO3}_2024v10
set NN = $NNPP
set SCEN = pp
set InputGenSim = $InputGenSimGRun3
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/test/getFrozenHLT.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ declare -A TABLES=(
["Fake"]="/dev/CMSSW_14_0_0/Fake"
["Fake1"]="/dev/CMSSW_14_0_0/Fake1"
["Fake2"]="/dev/CMSSW_14_0_0/Fake2"
["2023v12"]="/frozen/2023/2e34/v1.2/CMSSW_14_0_X/HLT"
["2024v10"]="/frozen/2024/2e34/v1.0/HLT"
)

# command-line arguments
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/test/runIntegration.csh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ echo Starting $0 $1 $2
if ( $2 == "" ) then
set tables = ( GRun )
else if ( $2 == ALL ) then
set tables = ( GRun HIon PIon PRef Special 2023v12 Fake Fake1 Fake2 )
set tables = ( GRun HIon PIon PRef Special 2024v10 Fake Fake1 Fake2 )
else if ( $2 == IB ) then
set tables = ( GRun HIon PIon PRef Special)
else if ( $2 == DEV ) then
Expand All @@ -19,7 +19,7 @@ else if ( $2 == FULL ) then
else if ( $2 == FAKE ) then
set tables = ( Fake Fake1 Fake2 )
else if ( $2 == FROZEN ) then
set tables = ( 2023v12 )
set tables = ( 2024v10 )
else
set tables = ( $2 )
endif
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/test/runOne.csh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ echo Starting $0 $1 $2
if ( $2 == "" ) then
set tables = ( GRun )
else if ( ($2 == all) || ($2 == ALL) ) then
set tables = ( GRun HIon PIon PRef 2023v12 Fake Fake1 Fake2 Special)
set tables = ( GRun HIon PIon PRef 2024v10 Fake Fake1 Fake2 Special)
else if ( ($2 == ib) || ($2 == IB) ) then
set tables = ( GRun HIon PIon PRef Special)
else if ( ($2 == dev) || ($2 == DEV) ) then
Expand All @@ -22,7 +22,7 @@ else if ( ($2 == full) || ($2 == FULL) ) then
else if ( ($2 == fake) || ($2 == FAKE) ) then
set tables = ( Fake Fake1 Fake2 )
else if ( ($2 == frozen) || ($2 == FROZEN) ) then
set tables = ( 2023v12 )
set tables = ( 2024v10 )
else
set tables = ( $2 )
endif
Expand Down

0 comments on commit 5f19fd1

Please sign in to comment.