Merge pull request #14445 from cms-tsg-storm/80XMay10HLT

HLT development in May (80X)
cms-sw · May 27, 2016 · 62b3f45 · 62b3f45
2 parents a7a5e87 + 6cdd1bd
commit 62b3f45
Show file tree

Hide file tree

Showing 50 changed files with 37,760 additions and 45,478 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -10,33 +10,33 @@
     # 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_v13',
+    'run2_design'       :   '80X_mcRun2_design_v14',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
-    'run2_mc_50ns'      :   '80X_mcRun2_startup_v13',
+    'run2_mc_50ns'      :   '80X_mcRun2_startup_v14',
     #GlobalTag for MC production with optimistic alignment and calibrations for Run2
-    'run2_mc'           :   '80X_mcRun2_asymptotic_v13',
+    'run2_mc'           :   '80X_mcRun2_asymptotic_v14',
     # 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_v12',
+    'run2_mc_cosmics'   :   '80X_mcRun2cosmics_startup_peak_v13',
     # 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
     'run1_data'         :   '80X_dataRun2_v14',
     # GlobalTag for Run2 data reprocessing
     'run2_data'         :   '80X_dataRun2_v14',
     # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
-    'run2_data_relval'  :   '80X_dataRun2_relval_v11',
+    'run2_data_relval'  :   '80X_dataRun2_relval_v12',
     # GlobalTag for Run1 HLT: it points to the online GT
     'run1_hlt'          :   '80X_dataRun2_HLT_frozen_v12',
     # GlobalTag for Run2 HLT: it points to the online GT
     'run2_hlt'          :   '80X_dataRun2_HLT_frozen_v12',
     # GlobalTag for Run2 HLT RelVals: customizations to run with fixed L1 Menu
-    'run2_hlt_relval'   :   '80X_dataRun2_HLT_relval_v10',
+    'run2_hlt_relval'   :   '80X_dataRun2_HLT_relval_v11',
     # GlobalTag for Run2 HLT for HI: it points to the online GT
     'run2_hlt_hi'       :   '80X_dataRun2_HLTHI_frozen_v9',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
-    'phase1_2017_design' :  '80X_upgrade2017_design_v12',
+    'phase1_2017_design' :  '80X_upgrade2017_design_v14',
     # GlobalTag for MC production with realistic conditions for for Phase1 2017 detector
-    'phase1_2017_realistic': '80X_upgrade2017_realistic_v4',
+    'phase1_2017_realistic': '80X_upgrade2017_realistic_v6',
     # 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) 
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase2

diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -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_v1_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-27 15:15:00.000"] ), ),
-    'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_v1_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-27 15:15:00.000"] ), ),
+    'FULL' : ( ','.join( [ 'L1Menu_Collisions2016_v4_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-05-24 14:55:00.000"] ), ),
+    'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_v4_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-05-24 14:55:00.000"] ), ),
     'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml'               ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
-    'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_v1_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-04-27 15:15:00.000"] ), ),
+    'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_v4_xml'                            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-05-24 14:55:00.000"] ), ),
     'PRef' : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_uGT_v2_mc_xml',l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
 }