Merge CMSSW_7_6_X into CMSSW_8_0_X.

cms-sw · Dec 8, 2015 · ec5722e · ec5722e
2 parents 9a0765e + f8ef215
commit ec5722e
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -10,23 +10,25 @@
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
     'run1_mc_pa'        :   '76X_mcRun1_pA_v10',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
-    'run2_design'       :   '76X_mcRun2_design_v12',
+    'run2_design'       :   '76X_mcRun2_design_v13',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
-    'run2_mc_50ns'      :   '76X_mcRun2_startup_v11',
+    'run2_mc_50ns'      :   '76X_mcRun2_startup_v12',
     #GlobalTag for MC production with optimistic alignment and calibrations for Run2
-    'run2_mc'           :   '76X_mcRun2_asymptotic_v12',
+    'run2_mc'           :   '76X_mcRun2_asymptotic_v13',
     # GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
     'run2_mc_hi'        :   '76X_mcRun2_HeavyIon_v12',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   '76X_dataRun1_v11',
+    'run1_data'         :   '76X_dataRun1_v15',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '76X_dataRun2_v11',
+    'run2_data'         :   '76X_dataRun2_v15',
     # GlobalTag for Run1 HLT: it points to the online GT
-    'run1_hlt'          :   '76X_dataRun1_HLT_frozen_v9',
+    'run1_hlt'          :   '76X_dataRun1_HLT_frozen_v10',
     # GlobalTag for Run2 HLT: it points to the online GT
-    'run2_hlt'          :   '76X_dataRun2_HLT_frozen_v9',
+    'run2_hlt'          :   '76X_dataRun2_HLT_frozen_v10',
+    # GlobalTag for Run2 HLT for HI: it points to the online GT
+    'run2_hlt_hi'       :   '76X_dataRun2_HLTHI_v1',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
-    'phase1_2017_design' :  '76X_upgrade2017_design_v7',
+    'phase1_2017_design' :  '76X_upgrade2017_design_v8',
     # 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