Skip to content

Commit

Permalink
add frozen HLT pp menu "V1.1" of 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
missirol committed May 9, 2023
1 parent c6a5629 commit 15c263f
Show file tree
Hide file tree
Showing 9 changed files with 31,674 additions and 28,543 deletions.
8 changes: 4 additions & 4 deletions Configuration/HLT/python/autoCondHLT.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'FULL' : ( ','.join( [ 'L1Menu_Collisions2023_v1_1_0-v2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-05-02 08:03:44.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2023_v1_1_0-v2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-05-02 08:03:44.000"] ), ),
'2022v15' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'2023v10' : ( ','.join( [ 'L1Menu_Collisions2023_v1_0_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-03-08 09:39:50.000"] ), ),
'2023v11' : ( ','.join( [ 'L1Menu_Collisions2023_v1_1_0-v2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-05-02 08:03:44.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"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_pp502Collisions2017_v4_m6_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-11-03 18:00:00.000"] ), ),
Expand All @@ -38,7 +38,7 @@
'run3_mc_FULL' : ('phase1_2023_realistic' ,l1Menus['FULL']),
'run3_mc_GRun' : ('phase1_2023_realistic' ,l1Menus['GRun']),
'run3_mc_2022v15' : ('phase1_2022_realistic' ,l1Menus['2022v15']),
'run3_mc_2023v10' : ('phase1_2023_realistic' ,l1Menus['2023v10']),
'run3_mc_2023v11' : ('phase1_2023_realistic' ,l1Menus['2023v11']),
'run3_mc_HIon' : ('phase1_2023_realistic_hi',l1Menus['HIon']),
'run3_mc_PIon' : ('phase1_2023_realistic' ,l1Menus['PIon']),
'run3_mc_PRef' : ('phase1_2023_realistic' ,l1Menus['PRef']),
Expand All @@ -50,7 +50,7 @@
'run3_hlt_FULL' : ('run3_hlt' ,l1Menus['FULL']),
'run3_hlt_GRun' : ('run3_hlt' ,l1Menus['GRun']),
'run3_hlt_2022v15' : ('run3_hlt' ,l1Menus['2022v15']),
'run3_hlt_2023v10' : ('run3_hlt' ,l1Menus['2023v10']),
'run3_hlt_2023v11' : ('run3_hlt' ,l1Menus['2023v11']),
'run3_hlt_HIon' : ('run3_hlt' ,l1Menus['HIon']),
'run3_hlt_PIon' : ('run3_hlt' ,l1Menus['PIon']),
'run3_hlt_PRef' : ('run3_hlt' ,l1Menus['PRef']),
Expand All @@ -62,7 +62,7 @@
'run3_data_FULL' : ('run3_data_prompt' ,l1Menus['FULL']),
'run3_data_GRun' : ('run3_data_prompt' ,l1Menus['GRun']),
'run3_data_2022v15' : ('run3_data_prompt' ,l1Menus['2022v15']),
'run3_data_2023v10' : ('run3_data_prompt' ,l1Menus['2023v10']),
'run3_data_2023v11' : ('run3_data_prompt' ,l1Menus['2023v11']),
'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',
'data' : 'auto:run3_hlt_relval',
'2022v15' : 'auto:run3_mc_2022v15',
'2023v10' : 'auto:run3_mc_2023v10',
'2023v11' : 'auto:run3_mc_2023v11',
}


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_13_0_0/HLT" # no version, take the latest one
TARGET="/online/collisions/2023/2e34/v1.0/HLT" # where to store the online-compliant menu
TARGET="/online/collisions/2023/2e34/v1.1/HLT" # where to store the online-compliant menu
TABLES="online_grun"

source subtables.sh
Expand Down

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 @@ -134,7 +134,7 @@ foreach gtag ( MC DATA )
if ( $1 == "" ) then
set tables = ( GRun )
else if ( ($1 == all) || ($1 == ALL) ) then
set tables = ( GRun HIon PIon PRef 2022v15 2023v10 Fake Fake1 Fake2 )
set tables = ( GRun HIon PIon PRef 2022v15 2023v11 Fake Fake1 Fake2 )
else if ( ($1 == ib) || ($1 == IB) ) then
set tables = ( GRun HIon PIon PRef )
else if ( ($1 == dev) || ($1 == DEV) ) then
Expand All @@ -144,7 +144,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 = ( 2022v15 2023v10 )
set tables = ( 2022v15 2023v11 )
else
set tables = ( $1 )
endif
Expand Down Expand Up @@ -231,11 +231,11 @@ foreach gtag ( MC DATA )
set Custom = " "
set L1REPACK = L1REPACK:Full
set DIGI = DIGI:pdigi
else if ( $table == 2023v10 ) then
else if ( $table == 2023v11 ) then
set XL1T = $XL1TPP3
set XHLT = HLT:2023v10
set GTAG = ${BASE3}_2023v10
set RTAG = ${RECO3}_2023v10
set XHLT = HLT:2023v11
set GTAG = ${BASE3}_2023v11
set RTAG = ${RECO3}_2023v11
set NN = $NNPP
set SCEN = pp
set InputGenSim = $InputGenSimGRun3
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/test/getFrozenHLT.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash

# ConfDB configurations to use
TABLES="Fake Fake1 Fake2 2022v15 2023v10"
TABLES="Fake Fake1 Fake2 2022v15 2023v11"
HLT_Fake="/dev/CMSSW_13_0_0/Fake"
HLT_Fake1="/dev/CMSSW_13_0_0/Fake1"
HLT_Fake2="/dev/CMSSW_13_0_0/Fake2"
HLT_2022v15="/frozen/2022/2e34/v1.5/CMSSW_13_0_X/HLT"
HLT_2023v10="/frozen/2023/2e34/v1.0/HLT"
HLT_2023v11="/frozen/2023/2e34/v1.1/HLT"

# command-line arguments
VERBOSE=false # print extra messages to stdout
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 2022v15 2023v10 Fake Fake1 Fake2 )
set tables = ( GRun HIon PIon PRef 2022v15 2023v11 Fake Fake1 Fake2 )
else if ( $2 == IB ) then
set tables = ( GRun HIon PIon PRef )
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 = ( 2022v15 2023v10 )
set tables = ( 2022v15 2023v11 )
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 2022v15 2023v10 Fake Fake1 Fake2 )
set tables = ( GRun HIon PIon PRef 2022v15 2023v11 Fake Fake1 Fake2 )
else if ( ($2 == ib) || ($2 == IB) ) then
set tables = ( GRun HIon PIon PRef )
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 = ( 2022v15 2023v10 )
set tables = ( 2022v15 2023v11 )
else
set tables = ( $2 )
endif
Expand Down

0 comments on commit 15c263f

Please sign in to comment.