Merge pull request #9679 from diguida/removePoolDBESSourceForQGL_and_…

…newCondDBv2GlobalTags Remove PoolDBESSource for QGL from cfi file and update Global Tags for RelVals
cms-sw · Jun 22, 2015 · 9513eab · 9513eab
2 parents 800bd18 + d0828e4
commit 9513eab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 31 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -2,29 +2,29 @@
 
     ### NEW KEYS ###
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
-    'run1_design'       :   'DESRUN1_75_V2',
+    'run1_design'       :   '75X_mcRun1_design_v1',
     # GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
-    'run1_mc'           :   'MCRUN1_75_V2',
+    'run1_mc'           :   '75X_mcRun1_realistic_v1',
     # GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_hi'        :   'MCHI1_75_V2',
+    'run1_mc_hi'        :   '75X_mcRun1_HeavyIon_v1',
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_pa'        :   'MCPA1_75_V2',
+    'run1_mc_pa'        :   '75X_mcRun1_pA_v1',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
-    'run2_design'       :   'DESRUN2_75_V2',
+    'run2_design'       :   '75X_mcRun2_design_v1',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
-    'run2_mc_50ns'      :   'MCRUN2_75_V4',
+    'run2_mc_50ns'      :   '75X_mcRun2_startup_v1',
     #GlobalTag for MC production with optimistic alignment and calibrations for Run2
-    'run2_mc'           :   'MCRUN2_75_V5',
+    'run2_mc'           :   '75X_mcRun2_asymptotic_v1',
     # GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
-    'run2_mc_hi'        :   'MCHI2_75_V2',
+    'run2_mc_hi'        :   '75X_mcRun2_HeavyIon_v1',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   'GR_R_75_V4A',
+    'run1_data'         :   '75X_dataRun1_v2',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   'GR_R_75_V5A',
-    # GlobalTag for Run1 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
-    'run1_hlt'          :   'GR_H_V61A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
-    # GlobalTag for Run2 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
-    'run2_hlt'          :   'GR_H_V62A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
+    'run2_data'         :   '75X_dataRun2_v2',
+    # GlobalTag for Run1 HLT: it points to the online GT
+    'run1_hlt'          :   '75X_dataRun1_HLT_v1',
+    # GlobalTag for Run2 HLT: it points to the online GT
+    'run2_hlt'          :   '75X_dataRun2_HLT_v1',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
     'phase1_2017_design' :  'DES17_70_V2', # placeholder (GT not meant for standard RelVal)
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019

diff --git a/RecoJets/JetProducers/python/QGTagger_cfi.py b/RecoJets/JetProducers/python/QGTagger_cfi.py
@@ -1,22 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-# See https://twiki.cern.ch/twiki/bin/viewauth/CMS/QGDataBaseVersion
-qgDatabaseVersion = 'v1'
-
-from CondCore.DBCommon.CondDBSetup_cfi import *
-QGPoolDBESSource = cms.ESSource("PoolDBESSource",
-      CondDBSetup,
-      toGet = cms.VPSet(),
-      connect = cms.string('frontier://FrontierProd/CMS_COND_PAT_000'),
-)
-
-for type in ['AK4PF','AK4PFchs','AK4PF_antib','AK4PFchs_antib']:
-  QGPoolDBESSource.toGet.extend(cms.VPSet(cms.PSet(
-    record = cms.string('QGLikelihoodRcd'),
-    tag    = cms.string('QGLikelihoodObject_'+qgDatabaseVersion+'_'+type),
-    label  = cms.untracked.string('QGL_'+type)
-  )))
-
 QGTagger = cms.EDProducer('QGTagger',
   srcJets		= cms.InputTag('ak4PFJetsCHS'),
   jetsLabel		= cms.string('QGL_AK4PFchs'),