Skip to content

Commit

Permalink
Make _relval GTs symbolic
Browse files Browse the repository at this point in the history
  • Loading branch information
@tvami
tvami committed Feb 6, 2023
1 parent e8ef640 commit e9139db
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 44 deletions.
37 changes: 17 additions & 20 deletions Configuration/AlCa/python/autoCond.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,18 @@
'run2_data' : '124X_dataRun2_v2',
# GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
'run2_data_HEfail' : '124X_dataRun2_HEfail_v2',
# GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
'run2_data_relval' : '124X_dataRun2_relval_v2',
# GlobalTag for Run2 HI data
'run2_data_promptlike_hi' : '124X_dataRun2_PromptLike_HI_v1',
# GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu
'run2_hlt_relval' : '123X_dataRun2_HLT_relval_v3',
# GlobalTag for Run3 HLT: identical to the online GT (126X_dataRun3_HLT_v1) but with snapshot at 2023-01-06 18:15:00 (UTC)
'run3_hlt' : '126X_dataRun3_HLT_frozen_v1',
# GlobalTag with fixed snapshot time for Run3 HLT RelVals: customizations to run with fixed L1 Menu
'run3_hlt_relval' : '126X_dataRun3_HLT_relval_v2',
# GlobalTag for Run3 data relvals (express GT) - identical to 126X_dataRun3_Express_v1 but with snapshot at 2023-01-06 18:15:00 (UTC)
'run3_data_express' : '126X_dataRun3_Express_frozen_v1',
# GlobalTag for Run3 data relvals (prompt GT) - identical to 126X_dataRun3_Prompt_v1 but with snapshot at 2023-01-06 18:15:00 (UTC)
'run3_data_prompt' : '126X_dataRun3_Prompt_frozen_v1',
# GlobalTag for Run3 offline data reprocessing - snapshot at 2023-01-06 18:15:00 (UTC)
'run3_data' : '126X_dataRun3_v1',
# GlobalTag for Run3 data relvals: allows customization to run with fixed L1 menu
'run3_data_relval' : '126X_dataRun3_relval_v2',
'run2_hlt' : '123X_dataRun2_HLT_relval_v3',
# GlobalTag for Run3 HLT: identical to the online GT (126X_dataRun3_HLT_v1) but with snapshot at 2023-01-28 12:00:00 (UTC)
'run3_hlt' : '126X_dataRun3_HLT_frozen_v2',
# GlobalTag for Run3 data relvals (express GT) - identical to 126X_dataRun3_Express_v1 but with snapshot at 2023-01-28 12:00:00 (UTC)
'run3_data_express' : '126X_dataRun3_Express_frozen_v2',
# GlobalTag for Run3 data relvals (prompt GT) - identical to 126X_dataRun3_Prompt_v1 but with snapshot at 2023-01-28 12:00:00 (UTC)
'run3_data_prompt' : '126X_dataRun3_Prompt_frozen_v2',
# GlobalTag for Run3 offline data reprocessing - snapshot at 2023-01-28 12:00:00 (UTC)
'run3_data' : '126X_dataRun3_v2',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
'phase1_2017_design' : '123X_mc2017_design_v2',
# GlobalTag for MC production with realistic conditions for Phase1 2017 detector
Expand Down Expand Up @@ -100,10 +94,14 @@
'BASEGT' : 'BASE1_V1|BASE2_V1'
}

### Run 1 data GTs ###
# GlobalTag with fixed snapshot time for Run1 HLT RelVals: customizations to run with fixed L1 Menu
autoCond['run1_hlt_relval'] = autoCond['run2_hlt_relval']
# GlobalTag for Run1 data reprocessing
# take fixed L1T menu as a symbolic GT
from Configuration.AlCa.autoCondModifiers import autoCondRelValForRun2
autoCond = autoCondRelValForRun2(autoCond)

from Configuration.AlCa.autoCondModifiers import autoCondRelValForRun3
autoCond = autoCondRelValForRun3(autoCond)

# GlobalTag for Run1 data reprocessing, history was carried over to run2 GTs
autoCond['run1_data'] = autoCond['run2_data']

# dedicated GlobalTags for HLT
Expand All @@ -130,7 +128,6 @@
from Configuration.AlCa.autoCondModifiers import autoCond2017ppRef5TeV
autoCond = autoCond2017ppRef5TeV(autoCond)


### OLD KEYS ### kept for backward compatibility
# GlobalTag for MC production with perfectly aligned and calibrated detector
autoCond['mc'] = ( autoCond['run1_design'] )
Expand Down
29 changes: 29 additions & 0 deletions Configuration/AlCa/python/autoCondModifiers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,32 @@ def autoCond2017ppRef5TeV(autoCond):
L1Menu_2017ppRef5TeV)
autoCond.update(GlobalTag2017ppRef5TeV)
return autoCond

def autoCondRelValForRun2(autoCond):

GlobalTagRelValForRun2 = {}
L1GtTriggerMenuForRelValForRun2 = ','.join( ['L1Menu_Collisions2015_25nsStage1_v5' , "L1GtTriggerMenuRcd", connectionString, "", "2023-01-28 12:00:00.000"] )
L1TUtmTriggerMenuForRelValForRun2 = ','.join( ['L1Menu_Collisions2018_v2_1_0-d1_xml ' , "L1TUtmTriggerMenuRcd", connectionString, "", "2023-01-28 12:00:00.000"] )

for key,val in autoCond.items():
if 'run2_data' in key or 'run2_hlt' in key:
GlobalTagRelValForRun2[key+'_relval'] = (autoCond[key],
L1GtTriggerMenuForRelValForRun2,
L1TUtmTriggerMenuForRelValForRun2)
autoCond.update(GlobalTagRelValForRun2)
return autoCond

def autoCondRelValForRun3(autoCond):

GlobalTagRelValForRun3 = {}
L1GtTriggerMenuForRelValForRun3 = ','.join( ['L1Menu_Collisions2015_25nsStage1_v5' , "L1GtTriggerMenuRcd", connectionString, "", "2023-01-28 12:00:00.000"] )
L1TUtmTriggerMenuForRelValForRun3 = ','.join( ['L1Menu_Collisions2022_v1_4_0-d1_xml' , "L1TUtmTriggerMenuRcd", connectionString, "", "2023-01-28 12:00:00.000"] )

for key,val in autoCond.items():
if 'run3_data' in key or 'run3_hlt' in key :
GlobalTagRelValForRun3[key+'_relval'] = (autoCond[key],
L1GtTriggerMenuForRelValForRun3,
L1TUtmTriggerMenuForRelValForRun3)
autoCond.update(GlobalTagRelValForRun3)
return autoCond

42 changes: 21 additions & 21 deletions Configuration/HLT/python/autoCondHLT.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#and leave unchanged the snapshot times for the other tuples.

l1Menus= {
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' ,l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' ,l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2022_v1_4_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-11-22 09:57:54.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2022_v1_4_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-11-22 09:57:54.000"] ), ),
Expand All @@ -41,27 +41,27 @@
'run3_mc_PIon' : ('phase1_2023_realistic' ,l1Menus['PIon']),
'run3_mc_PRef' : ('phase1_2023_realistic' ,l1Menus['PRef']),

'run1_hlt_Fake' : ('run1_hlt_relval' ,l1Menus['Fake']),
'run2_hlt_Fake' : ('run2_hlt_relval' ,l1Menus['Fake']),
'run2_hlt_Fake1' : ('run2_hlt_relval' ,l1Menus['Fake1']),
'run2_hlt_Fake2' : ('run2_hlt_relval' ,l1Menus['Fake2']),
'run3_hlt_FULL' : ('run3_hlt_relval' ,l1Menus['FULL']),
'run3_hlt_GRun' : ('run3_hlt_relval' ,l1Menus['GRun']),
'run3_hlt_2022v15' : ('run3_hlt_relval' ,l1Menus['2022v15']),
'run3_hlt_HIon' : ('run3_hlt_relval' ,l1Menus['HIon']),
'run3_hlt_PIon' : ('run3_hlt_relval' ,l1Menus['PIon']),
'run3_hlt_PRef' : ('run3_hlt_relval' ,l1Menus['PRef']),
'run1_hlt_Fake' : ('run2_hlt' ,l1Menus['Fake']),
'run2_hlt_Fake' : ('run2_hlt' ,l1Menus['Fake']),
'run2_hlt_Fake1' : ('run2_hlt' ,l1Menus['Fake1']),
'run2_hlt_Fake2' : ('run2_hlt' ,l1Menus['Fake2']),
'run3_hlt_FULL' : ('run3_hlt' ,l1Menus['FULL']),
'run3_hlt_GRun' : ('run3_hlt' ,l1Menus['GRun']),
'run3_hlt_2022v15' : ('run3_hlt' ,l1Menus['2022v15']),
'run3_hlt_HIon' : ('run3_hlt' ,l1Menus['HIon']),
'run3_hlt_PIon' : ('run3_hlt' ,l1Menus['PIon']),
'run3_hlt_PRef' : ('run3_hlt' ,l1Menus['PRef']),

'run1_data_Fake' : ('run1_data' ,l1Menus['Fake']),
'run2_data_Fake' : ('run2_data_relval' ,l1Menus['Fake']),
'run2_data_Fake1' : ('run2_data_relval' ,l1Menus['Fake1']),
'run2_data_Fake2' : ('run2_data_relval' ,l1Menus['Fake2']),
'run3_data_FULL' : ('run3_data_relval' ,l1Menus['FULL']),
'run3_data_GRun' : ('run3_data_relval' ,l1Menus['GRun']),
'run3_data_2022v15' : ('run3_data_relval' ,l1Menus['2022v15']),
'run3_data_HIon' : ('run3_data_relval' ,l1Menus['HIon']),
'run3_data_PIon' : ('run3_data_relval' ,l1Menus['PIon']),
'run3_data_PRef' : ('run3_data_relval' ,l1Menus['PRef']),
'run2_data_Fake' : ('run2_data' ,l1Menus['Fake']),
'run2_data_Fake1' : ('run2_data' ,l1Menus['Fake1']),
'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_2022v15' : ('run3_data_prompt' ,l1Menus['2022v15']),
'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
6 changes: 3 additions & 3 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2481,7 +2481,7 @@ def lhegensim2018ml(fragment,howMuch):
'--era':'Run3',
'--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco])

steps['RECODR3_reHLT']=merge([{'--conditions':'auto:run3_data_relval', '--hltProcess':'reHLT'},steps['RECODR3']])
steps['RECODR3_reHLT']=merge([{'--conditions':'auto:run3_data_prompt_relval', '--hltProcess':'reHLT'},steps['RECODR3']])

steps['RECODR3Splash']=merge([{'-n': 2,
'-s': 'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM'
Expand Down Expand Up @@ -2514,7 +2514,7 @@ def lhegensim2018ml(fragment,howMuch):
'--data':'',
'--era':'Run3',
'--scenario':'pp',
'--conditions':'auto:run3_data_relval',
'--conditions':'auto:run3_data_prompt_relval',
'--hltProcess':'reHLT'}
if 'Cosmics' in s:
steps['SKIM'+s.upper()+'RUN3_reHLT']['--scenario'] = 'cosmics'
Expand Down Expand Up @@ -3305,7 +3305,7 @@ def gen2021HiMix(fragment,howMuch):
steps['HARVESTDCRUN2']=merge([{'--conditions':'auto:run2_data','--era':'Run2_2016'},steps['HARVESTDC']])

steps['HARVESTDR3'] = merge([{'--conditions':'auto:run3_data','--era':'Run3'}, steps['HARVESTD']])
steps['HARVESTDR3_reHLT'] = merge([{'--conditions':'auto:run3_data_relval','--hltProcess':'reHLT'}, steps['HARVESTDR3']])
steps['HARVESTDR3_reHLT'] = merge([{'--conditions':'auto:run3_data_prompt_relval','--hltProcess':'reHLT'}, steps['HARVESTDR3']])
steps['HARVESTD2021MB_reHLT'] = merge([{'-s':'HARVESTING:@commonSiStripZeroBias+@ExtraHLT+@miniAODDQM'}, steps['HARVESTDR3_reHLT'] ])
steps['HARVESTD2021ZB_reHLT'] = merge([{'-s':'HARVESTING:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'}, steps['HARVESTDR3_reHLT'] ])
steps['HARVESTD2021HLTPhy_reHLT'] = merge([{'-s':'HARVESTING:@commonReduced+@miniAODDQM'}, steps['HARVESTDR3_reHLT'] ])
Expand Down

0 comments on commit e9139db

Please sign in to comment.