Merge pull request #14107 from davidlange6/l1hlt80x

HLT for L1v4 + GT+ relval + L1 fixes from valgrind (back ports)
cms-sw · Apr 16, 2016 · fc54ad4 · fc54ad4
2 parents 18c35c6 + db3d500
commit fc54ad4
Show file tree

Hide file tree

Showing 53 changed files with 35,445 additions and 35,729 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -10,31 +10,31 @@
     # 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_v9',
+    'run2_design'       :   '80X_mcRun2_design_v11',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
-    'run2_mc_50ns'      :   '80X_mcRun2_startup_v9',
+    'run2_mc_50ns'      :   '80X_mcRun2_startup_v11',
     #GlobalTag for MC production with optimistic alignment and calibrations for Run2
-    'run2_mc'           :   '80X_mcRun2_asymptotic_v9',
+    'run2_mc'           :   '80X_mcRun2_asymptotic_v11',
     # 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_v8',
+    'run2_mc_cosmics'   :   '80X_mcRun2cosmics_startup_peak_v10',
     # 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_v9',
+    'run1_data'         :   '80X_dataRun2_v11',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '80X_dataRun2_v9',
+    'run2_data'         :   '80X_dataRun2_v11',
     # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
-    'run2_data_relval'  :   '80X_dataRun2_relval_v4',
+    'run2_data_relval'  :   '80X_dataRun2_relval_v6',
     # GlobalTag for Run1 HLT: it points to the online GT
-    'run1_hlt'          :   '80X_dataRun2_HLT_frozen_v8',
+    'run1_hlt'          :   '80X_dataRun2_HLT_frozen_v11',
     # GlobalTag for Run2 HLT: it points to the online GT
-    'run2_hlt'          :   '80X_dataRun2_HLT_frozen_v8',
+    '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_v4',
+    'run2_hlt_relval'   :   '80X_dataRun2_HLT_relval_v7',
     # 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_v7',
+    'phase1_2017_design' :  '80X_upgrade2017_design_v10',
     # 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
@@ -1,21 +1,28 @@
 # https://cms-conddb.cern.ch/browser/#search
 
-#default value for all L1T menus
+# default value for all L1T menus
 connectionString = "frontier://FrontierProd/CMS_CONDITIONS"
+
+# L1T legacy (Fake) / stage-1 (Fake1)
 l1MenuRecord = "L1GtTriggerMenuRcd"
 l1MenuLabel = ""
 
+# L1T stage-2
+l1tMenuRecord = "L1TUtmTriggerMenuRcd"
+l1tMenuLabel = ""
+
 #The snapshot time has been set as starting point as the one of PR 12095.
 #Next time you change the customisations, change also the snapshot time in the affected tuple,
 #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"] ), ),
-    'FULL'         : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5'          , l1MenuRecord, connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
-    'GRun'         : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5'          , l1MenuRecord, connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
-    'HIon'         : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_mc'         , l1MenuRecord, connectionString, l1MenuLabel, "2015-11-26 20:00:00.000"] ), ),
-    'PIon'         : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5'          , l1MenuRecord, connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
-    'PRef'         : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_mc', l1MenuRecord, connectionString, l1MenuLabel, "2015-11-25 20: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"] ), ),
+    '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"] ), ),
+    '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"] ), ),
+    'PRef' : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_uGT_v2_mc_xml',l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
 }
 
 hltGTs = {
@@ -24,6 +31,7 @@
 
     'run1_mc_Fake'           : ('run1_mc'      ,l1Menus['Fake']),
     'run2_mc_Fake'           : ('run2_mc'      ,l1Menus['Fake']),
+    'run2_mc_Fake1'          : ('run2_mc'      ,l1Menus['Fake1']),
     'run2_mc_FULL'           : ('run2_mc'      ,l1Menus['FULL']),
     'run2_mc_GRun'           : ('run2_mc'      ,l1Menus['GRun']),
     'run2_mc_HIon'           : ('run2_mc_hi'   ,l1Menus['HIon']),
@@ -32,6 +40,7 @@
 
     'run1_hlt_Fake'          : ('run1_hlt'     ,l1Menus['Fake']),
     'run2_hlt_Fake'          : ('run2_hlt'     ,l1Menus['Fake']),
+    'run2_hlt_Fake1'         : ('run2_hlt'     ,l1Menus['Fake1']),
     'run2_hlt_FULL'          : ('run2_hlt'     ,l1Menus['FULL']),
     'run2_hlt_GRun'          : ('run2_hlt'     ,l1Menus['GRun']),
     'run2_hlt_HIon'          : ('run2_hlt_hi'  ,l1Menus['HIon']),
@@ -40,6 +49,7 @@
 
     'run1_data_Fake'         : ('run1_data'    ,l1Menus['Fake']),
     'run2_data_Fake'         : ('run2_data'    ,l1Menus['Fake']),
+    'run2_data_Fake1'        : ('run2_data'    ,l1Menus['Fake1']),
     'run2_data_FULL'         : ('run2_data'    ,l1Menus['FULL']),
     'run2_data_GRun'         : ('run2_data'    ,l1Menus['GRun']),
     'run2_data_HIon'         : ('run2_data'    ,l1Menus['HIon']),
@@ -54,4 +64,21 @@ def autoCondHLT(autoCond):
            autoCond[key] = ( autoCond[val[0]] )
         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
diff --git a/Configuration/HLT/python/autoHLT.py b/Configuration/HLT/python/autoHLT.py
@@ -2,16 +2,10 @@
 #   cmsDiver.py hlt -s HLT:@relval
 
 autoHLT = {
-  'frozen'     : 'GRun',
-  'relval'     : 'GRun',
-  'frozenHIon' : 'HIon',
-  'relvalHIon' : 'HIon',
-  'frozenPRef' : 'PRef',
-  'relvalPRef' : 'PRef',
-  'frozen25ns' : 'GRun',
-  'relval25ns' : 'GRun',
-  'frozen50ns' : 'Fake',
-  'relval50ns' : 'Fake',
   'fake'       : 'Fake',
+  'fake1'      : 'Fake1',
+  'relval50ns' : 'Fake',
+  'relval25ns' : 'Fake1',
+  'relval2016' : 'GRun',
   'test'       : 'GRun',
 }