Merge pull request #19502 from cms-tsg-storm/HLTMenuV2_93X_auto

HLT menu "Phlegyas" (V2) plus GT work (93X)
cms-sw · Jul 18, 2017 · f83119a · f83119a
2 parents 3f5ebf2 + 77557b8
commit f83119a
Show file tree

Hide file tree

Showing 20 changed files with 179,647 additions and 133,877 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -22,39 +22,39 @@
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
     'run2_mc_pa'        :   '92X_mcRun2_pA_v2',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   '92X_dataRun2_v4',
+    'run1_data'         :   '92X_dataRun2_v5',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '92X_dataRun2_v4',
+    'run2_data'         :   '92X_dataRun2_v5',
     # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
-    'run2_data_relval'  :   '92X_dataRun2_relval_v5',
+    'run2_data_relval'  :   '92X_dataRun2_relval_v6',
     # GlobalTag for Run2 data 2016H relvals only: Prompt Conditions + fixed L1 menu (to be removed)
-    'run2_data_promptlike' : '92X_dataRun2_PromptLike_v4',
+    'run2_data_promptlike' : '92X_dataRun2_PromptLike_v5',
     # GlobalTag for Run1 HLT: it points to the online GT
     'run1_hlt'          :   '92X_dataRun2_HLT_frozen_v6',
     # GlobalTag for Run2 HLT: it points to the online GT
     'run2_hlt'          :   '92X_dataRun2_HLT_frozen_v6',
     # GlobalTag for Run2 HLT RelVals: customizations to run with fixed L1 Menu
-    'run2_hlt_relval'   :   '92X_dataRun2_HLT_relval_v6',
+    'run2_hlt_relval'   :   '92X_dataRun2_HLT_relval_v7',
     # GlobalTag for Run2 HLT for HI: it points to the online GT
-    'run2_hlt_hi'       :   '92X_dataRun2_HLTHI_frozen_v5',
+    'run2_hlt_hi'       :   '92X_dataRun2_HLTHI_frozen_v6',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
-    'phase1_2017_design'       :  '92X_upgrade2017_design_IdealBS_v7',
+    'phase1_2017_design'       :  '92X_upgrade2017_design_IdealBS_v8',
     # GlobalTag for MC production with realistic conditions for Phase1 2017 detector
-    'phase1_2017_realistic'    : '92X_upgrade2017_realistic_v7',
+    'phase1_2017_realistic'    : '92X_upgrade2017_realistic_v8',
     # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in DECO mode
-    'phase1_2017_cosmics'      : '92X_upgrade2017cosmics_realistic_deco_v7',
+    'phase1_2017_cosmics'      : '92X_upgrade2017cosmics_realistic_deco_v8',
     # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in PEAK mode
-    'phase1_2017_cosmics_peak' : '92X_upgrade2017cosmics_realistic_peak_v7',
+    'phase1_2017_cosmics_peak' : '92X_upgrade2017cosmics_realistic_peak_v8',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for full Phase1 2018 (and 0,0,0-centred beamspot)
-    'phase1_2018_design'       : '92X_upgrade2018_design_IdealBS_v6',
+    'phase1_2018_design'       : '92X_upgrade2018_design_IdealBS_v7',
     # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector
-    'phase1_2018_realistic'    : '92X_upgrade2018_realistic_v7',
+    'phase1_2018_realistic'    : '92X_upgrade2018_realistic_v8',
     # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector,  Strip tracker in DECO mode
-    'phase1_2018_cosmics'      :   '92X_upgrade2018cosmics_realistic_deco_v7',
+    'phase1_2018_cosmics'      :   '92X_upgrade2018cosmics_realistic_deco_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 realistic conditions for Phase2 2023
-    'phase2_realistic'         : '92X_upgrade2023_realistic_v1'
+    'phase2_realistic'         : '92X_upgrade2023_realistic_v2'
 }
 
 aliases = {

diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -18,9 +18,9 @@
 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"] ), ),
-    'Fake2'        : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml'               ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ),
-    'FULL'         : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml'               ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ),
-    'GRun'         : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml'               ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ),
+    'Fake2'        : ( ','.join( [ 'L1Menu_Collisions2017_v2_m6_full_xml'                    ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-07-08 11:46:40.000"] ), ),
+    'FULL'         : ( ','.join( [ 'L1Menu_Collisions2017_v2_m6_full_xml'                    ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-07-08 11:46:40.000"] ), ),
+    'GRun'         : ( ','.join( [ 'L1Menu_Collisions2017_v2_m6_full_xml'                    ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-07-08 11:46:40.000"] ), ),
     'GRun2016'     : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml'                         ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
     'HIon'         : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml'               ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
     'PIon'         : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml'                          ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),