Skip to content

Commit

Permalink
Merge pull request #14106 from cms-tsg-storm/HLTinApril80X
Browse files Browse the repository at this point in the history 
HLT update to L1T menu v5 incl. GT (80X)
  • Loading branch information
@davidlange6
davidlange6 committed Apr 20, 2016
2 parents 14b913a + 5cca24a commit f520689
Show file tree
Hide file tree
Showing 24 changed files with 31,596 additions and 21,540 deletions.
18 changes: 10 additions & 8 deletions Configuration/AlCa/python/autoCond.py
View file
Expand Up @@ -10,13 +10,13 @@
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : '80X_mcRun1_pA_v4',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : '80X_mcRun2_design_v11',
'run2_design' : '80X_mcRun2_design_v12',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : '80X_mcRun2_startup_v11',
'run2_mc_50ns' : '80X_mcRun2_startup_v12',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : '80X_mcRun2_asymptotic_v11',
'run2_mc' : '80X_mcRun2_asymptotic_v12',
# GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode
'run2_mc_cosmics' : '80X_mcRun2cosmics_startup_peak_v10',
'run2_mc_cosmics' : '80X_mcRun2cosmics_startup_peak_v11',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : '80X_mcRun2_HeavyIon_v8',
# GlobalTag for Run1 data reprocessing
Expand All @@ -30,15 +30,17 @@
# GlobalTag for Run2 HLT: it points to the online GT
'run2_hlt' : '80X_dataRun2_HLT_frozen_v11',
# GlobalTag for Run2 HLT RelVals: customizations to run with fixed L1 Menu
'run2_hlt_relval' : '80X_dataRun2_HLT_relval_v7',
'run2_hlt_relval' : '80X_dataRun2_HLT_relval_v8',
# GlobalTag for Run2 HLT for HI: it points to the online GT
'run2_hlt_hi' : '80X_dataRun2_HLTHI_frozen_v7',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
'phase1_2017_design' : '80X_upgrade2017_design_v10',
'phase1_2017_design' : '80X_upgrade2017_design_v11',
# GlobalTag for MC production with realistic conditions for for Phase1 2017 detector
'phase1_2017_realistic': '80X_upgrade2017_realistic_v3',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
'phase1_2019_design' : 'DES19_70_V2', # placeholder (GT not meant for standard RelVal)
'phase1_2019_design' : 'DES19_70_V2', # placeholder (GT not meant for standard RelVal)
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase2
'phase2_design' : 'POSTLS262_V1', # placeholder (GT not meant for standard RelVal)
'phase2_design' : 'POSTLS262_V1', # placeholder (GT not meant for standard RelVal)
}

aliases = {
Expand Down
22 changes: 3 additions & 19 deletions Configuration/HLT/python/autoCondHLT.py
View file
Expand Up @@ -18,10 +18,10 @@
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"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v4_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-24 10:00:00.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v4_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-24 10:00:00.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v5_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-15 10:00:00.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v5_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-15 10:00:00.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v4_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-24 10:00:00.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v5_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-15 10:00:00.000"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_uGT_v2_mc_xml',l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
}

Expand Down Expand Up @@ -65,20 +65,4 @@ def autoCondHLT(autoCond):
else:
autoCond[key] = ( autoCond[val[0]],) + val[1]

payLoad = ('pfscecal_EBCorrection_online_v0,GBRDWrapperRcd,frontier://FrontierProd/CMS_CONDITIONS,pfscecal_EBCorrection_online,2016-02-17 21:00:00.000',)
autoCond['run2_data_GRun'] = autoCond['run2_data_GRun'] + payLoad
autoCond['run2_data_PIon'] = autoCond['run2_data_PIon'] + payLoad

payLoad = ('pfscecal_EECorrection_online_v0,GBRDWrapperRcd,frontier://FrontierProd/CMS_CONDITIONS,pfscecal_EECorrection_online,2016-02-17 21:00:00.000',)
autoCond['run2_data_GRun'] = autoCond['run2_data_GRun'] + payLoad
autoCond['run2_data_PIon'] = autoCond['run2_data_PIon'] + payLoad

payLoad = ('pfscecal_EBUncertainty_online_v0,GBRDWrapperRcd,frontier://FrontierProd/CMS_CONDITIONS,pfscecal_EBUncertainty_online,2016-02-17 21:00:00.000',)
autoCond['run2_data_GRun'] = autoCond['run2_data_GRun'] + payLoad
autoCond['run2_data_PIon'] = autoCond['run2_data_PIon'] + payLoad

payLoad = ('pfscecal_EEUncertainty_online_v0,GBRDWrapperRcd,frontier://FrontierProd/CMS_CONDITIONS,pfscecal_EEUncertainty_online,2016-02-17 21:00:00.000',)
autoCond['run2_data_GRun'] = autoCond['run2_data_GRun'] + payLoad
autoCond['run2_data_PIon'] = autoCond['run2_data_PIon'] + payLoad

return autoCond

0 comments on commit f520689

Please sign in to comment.