Adjustment of GTs for internal TSG tests

cms-sw · Jun 29, 2017 · 1ba3f7d · 1ba3f7d
1 parent 0f37c81
commit 1ba3f7d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 22 deletions.
diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -46,29 +46,28 @@
     'run2_hlt_Fake'          : ('run2_hlt_relval'      ,l1Menus['Fake']),
     'run2_hlt_Fake1'         : ('run2_hlt_relval'      ,l1Menus['Fake1']),
     'run2_hlt_Fake2'         : ('run2_hlt_relval'      ,l1Menus['Fake2']),
-    'run2_hlt_GRun2016'      : ('run2_hlt'             ,l1Menus['GRun2016']),
-    'run2_hlt_FULL'          : ('phase1_2017_realistic',l1Menus['FULL']),
-    'run2_hlt_GRun'          : ('phase1_2017_realistic',l1Menus['GRun']),
+    'run2_hlt_GRun2016'      : ('run2_hlt_relval'      ,l1Menus['GRun2016']),
+    'run2_hlt_FULL'          : ('run2_hlt_relval'      ,l1Menus['FULL']),
+    'run2_hlt_GRun'          : ('run2_hlt_relval'      ,l1Menus['GRun']),
     'run2_hlt_HIon'          : ('run2_hlt_hi'          ,l1Menus['HIon']),
-    'run2_hlt_PIon'          : ('phase1_2017_realistic',l1Menus['PIon']),
-    'run2_hlt_PRef'          : ('phase1_2017_realistic',l1Menus['PRef']),
+    'run2_hlt_PIon'          : ('run2_hlt_relval'      ,l1Menus['PIon']),
+    'run2_hlt_PRef'          : ('run2_hlt_relval'      ,l1Menus['PRef']),
 
     'run1_data_Fake'         : ('run1_data'            ,l1Menus['Fake']),
     'run2_data_Fake'         : ('run2_data_relval'     ,l1Menus['Fake']),
     'run2_data_Fake1'        : ('run2_data_relval'     ,l1Menus['Fake1']),
     'run2_data_Fake2'        : ('run2_data_relval'     ,l1Menus['Fake2']),
-    'run2_data_GRun2016'     : ('run2_data'            ,l1Menus['GRun2016']),
-    'run2_data_FULL'         : ('phase1_2017_realistic',l1Menus['FULL']),
-    'run2_data_GRun'         : ('phase1_2017_realistic',l1Menus['GRun']),
-    'run2_data_HIon'         : ('run2_data'            ,l1Menus['HIon']),
-    'run2_data_PIon'         : ('phase1_2017_realistic',l1Menus['PIon']),
-    'run2_data_PRef'         : ('phase1_2017_realistic',l1Menus['PRef']),
-
-    'phase1_2017_design_GRun'     : ('phase1_2017_design'   ,l1Menus['GRun']),
-    'phase1_2017_realistic_GRun'  : ('phase1_2017_realistic',l1Menus['GRun']),
+    'run2_data_GRun2016'     : ('run2_data_relval'     ,l1Menus['GRun2016']),
+    'run2_data_FULL'         : ('run2_data_relval'     ,l1Menus['FULL']),
+    'run2_data_GRun'         : ('TSG2_data_relval'     ,l1Menus['GRun']),
+    'run2_data_HIon'         : ('run2_data_relval'     ,l1Menus['HIon']),
+    'run2_data_PIon'         : ('TSG2_data_relval'     ,l1Menus['PIon']),
+    'run2_data_PRef'         : ('TSG2_data_relval'     ,l1Menus['PRef']),
+
 }
 
 def autoCondHLT(autoCond):
+    autoCond['TSG2_data_relval'] = '91X_dataRun2_PromptLike_v4' # temporary
     for key,val in hltGTs.iteritems():
         if len(val)==1 :
            autoCond[key] = ( autoCond[val[0]] )

diff --git a/Configuration/HLT/python/autoHLT.py b/Configuration/HLT/python/autoHLT.py
@@ -7,9 +7,7 @@
   'fake2'      : 'Fake2',
   'relval50ns' : 'Fake',
   'relval25ns' : 'Fake1',
-  'frozen2016' : 'GRun2016',
   'relval2016' : 'Fake2',
-  'frozen2017' : 'GRun',
   'relval2017' : 'GRun',
   'test'       : 'GRun',
 }
diff --git a/HLTrigger/Configuration/python/CustomConfigs.py b/HLTrigger/Configuration/python/CustomConfigs.py
@@ -95,6 +95,21 @@ def L1THLT(process):
     if hasattr(process,'TriggerMenu'):
         delattr(process,'TriggerMenu')
 
+    if hasattr(process,'GlobalTag'):
+       for det in ('EB','EE'):
+           for obj in ('Correction','Uncertainty'):
+               labString = 'pfscecal_'+det+obj+'_online'
+               tagString = labString+'_v0'
+               process.GlobalTag.toGet.append(
+                  cms.PSet(
+                      connect = cms.string('frontier://FrontierProd/CMS_CONDITIONS'),
+                      record = cms.string('GBRDWrapperRcd'),
+                      snapshotTime = cms.string('2016-02-17 21:00:00.000'),
+                      label = cms.untracked.string(labString),
+                      tag = cms.string(tagString)
+                      )
+                  )
+
     process=Base(process)
 
     return(process)

diff --git a/HLTrigger/Configuration/test/cmsDriver.csh b/HLTrigger/Configuration/test/cmsDriver.csh
@@ -49,8 +49,8 @@ set BASE2RD  = auto:run2_data
 
 set NNPPMC = 100
 set NNPPRD = 100
-set NNHIMC = 25
-set NNHIRD = 25
+set NNPRMC = 20
+set NNPRRD = 20
 
 set EraRun1        = " "
 set EraRun25ns     = " --era=Run2_25ns "
@@ -87,15 +87,15 @@ foreach gtag ( MC DATA )
     set BASE1  = $BASE1HLT
     set BASE2  = $BASE2HLT
     set NNPP   = $NNPPRD
-    set NNHI   = $NNHIRD
+    set NNPR   = $NNPRRD
     set DATAMC = --data
     set PNAME  = HLT1
     set RNAME  = RECO1
   else  if ( $gtag == MC ) then
     set BASE1  = $BASE1MC
     set BASE2  = $BASE2MC
     set NNPP   = $NNPPMC
-    set NNHI   = $NNHIMC
+    set NNPR   = $NNPRMC
     set DATAMC = --mc
     set PNAME  = HLT
     set RNAME  = RECO
@@ -203,7 +203,7 @@ foreach gtag ( MC DATA )
       set XHLT = HLT:HIon
       set GTAG = ${BASE2}_HIon
       set RTAG = ${BASE2RD}_HIon
-      set NN   = $NNHI
+      set NN   = $NNPP
       set SCEN = HeavyIons
       set InputGenSim = $InputGenSimHIon1
       set InputLHCRaw = $InputLHCRawHIon1
@@ -227,7 +227,7 @@ foreach gtag ( MC DATA )
       set XHLT = HLT:PRef
       set GTAG = ${BASE2}_PRef
       set RTAG = ${BASE2RD}_PRef
-      set NN   = $NNPP
+      set NN   = $NNPR
       set SCEN = pp
       set InputGenSim = $InputGenSimPRef3
       set InputLHCRaw = $InputLHCRawPRef3