Merge pull request #5666 from diguida/AK5toAK4_72x_rebase_new_GlobalTags

AK5 to AK4 migration with new Global Tags
cms-sw · Oct 7, 2014 · c52d23d · c52d23d
2 parents 2ab11c0 + a9c40a3
commit c52d23d
Show file tree

Hide file tree

Showing 37 changed files with 602 additions and 240 deletions.
diff --git a/CommonTools/ParticleFlow/python/pfType1MET_cfi.py b/CommonTools/ParticleFlow/python/pfType1MET_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-# Type-1 met corrections (AK5PFJets)
+# Type-1 met corrections (AK4PFJets)
 # remember about including ES producer definition e.g. JetMETCorrections.Configuration.L2L3Corrections_Summer08Redigi_cff
 
 pfType1MET = cms.EDProducer("Type1PFMET",
@@ -11,6 +11,6 @@
     jetPTthreshold = cms.double(20.0),
     # pfMET should be not corrected for HF 0.7
     inputUncorMetLabel = cms.string("pfMET"),
-    corrector = cms.string("L2L3JetCorrectorAK5PF")
+    corrector = cms.string("L2L3JetCorrectorAK4PF")
 )
 
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -2,27 +2,27 @@
 
     ### NEW KEYS ###
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
-    'run1_design'       :   'PRE_MC_72_V4::All',
+    'run1_design'       :   'PRE_MC_72_V6::All',
     # GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
-    'run1_mc'           :   'PRE_STA72_V4::All',
+    'run1_mc'           :   'PRE_STA72_V6::All',
     # GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_hi'        :   'PRE_SHI72_V7::All',
+    'run1_mc_hi'        :   'PRE_SHI72_V11::All',
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_pa'        :   'PRE_SHI72_V8::All',
+    'run1_mc_pa'        :   'PRE_SHI72_V12::All',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
-    'run2_design'       :   'PRE_DES72_V6::All',
+    'run2_design'       :   'PRE_DES72_V8::All',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
-    'run2_mc_50ns'      :   'PRE_LS172_V12::All',
+    'run2_mc_50ns'      :   'PRE_LS172_V16::All',
     #GlobalTag for MC production with optimistic alignment and calibrations for Run2
-    'run2_mc'           :   'PRE_LS172_V11::All',
+    'run2_mc'           :   'PRE_LS172_V15::All',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   'PRE_R_72_V6A::All',
+    'run1_data'         :   'PRE_R_72_V10A::All',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   'PRE_R_72_V7A::All',
+    'run2_data'         :   'PRE_R_72_V11A::All',
     # GlobalTag for Run1 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
-    'run1_hlt'          :   'GR_H_V38A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
+    'run1_hlt'          :   'GR_H_V41A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,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_V40A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
+    'run2_hlt'          :   'GR_H_V42A::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
     'phase1_2017_design' :  'DES17_70_V2::All', # placeholder (GT not meant for standard RelVal)
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019

diff --git a/Configuration/AlCa/python/autoCond_condDBv2.py b/Configuration/AlCa/python/autoCond_condDBv2.py
@@ -2,27 +2,27 @@
 
     ### NEW KEYS ###
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
-    'run1_design'       :   'PRE_MC_72_V4',
+    'run1_design'       :   'PRE_MC_72_V6',
     # GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
-    'run1_mc'           :   'PRE_STA72_V4',
+    'run1_mc'           :   'PRE_STA72_V6',
     # GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_hi'        :   'PRE_SHI72_V7',
+    'run1_mc_hi'        :   'PRE_SHI72_V11',
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_pa'        :   'PRE_SHI72_V8',
+    'run1_mc_pa'        :   'PRE_SHI72_V12',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
-    'run2_design'       :   'PRE_DES72_V6',
+    'run2_design'       :   'PRE_DES72_V8',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
-    'run2_mc_50ns'      :   'PRE_LS172_V12',
+    'run2_mc_50ns'      :   'PRE_LS172_V16',
     #GlobalTag for MC production with optimistic alignment and calibrations for Run2
-    'run2_mc'           :   'PRE_LS172_V11',
+    'run2_mc'           :   'PRE_LS172_V15',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   'PRE_R_72_V6A',
+    'run1_data'         :   'PRE_R_72_V10A',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   'PRE_R_72_V7A',
+    'run2_data'         :   'PRE_R_72_V11A',
     # GlobalTag for Run1 HLT: it points to the online GT and overrides the connection string and pfnPrefix for use offline
-    'run1_hlt'          :   'GR_H_V38A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
+    'run1_hlt'          :   'GR_H_V41A,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_V40A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
+    'run2_hlt'          :   'GR_H_V42A,frontier://FrontierProd/CMS_CONDITIONS,frontier://FrontierProd/',
     # 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
@@ -36,42 +36,6 @@
     'BASEGT' : 'BASE1_V1|BASE2_V1'
 }
 
-# L1 configuration used during Run2012D
-conditions_L1_Run2012D = (
-    # L1 GT menu 2012 v3, used during Run2012D
-    'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc,L1GtTriggerMenuRcd,frontier://FrontierProd/CMS_CONDITIONS',
-    # L1 GCT configuration with 5 GeV jet seed threshold, used since Run2012C
-    'L1GctJetFinderParams_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1GctJetFinderParamsRcd,frontier://FrontierProd/CMS_CONDITIONS',
-    'L1HfRingEtScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1HfRingEtScaleRcd,frontier://FrontierProd/CMS_CONDITIONS',
-    'L1HtMissScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1HtMissScaleRcd,frontier://FrontierProd/CMS_CONDITIONS',
-    'L1JetEtScale_GCTPhysics_2012_04_27_JetSeedThresh5GeV_mc,L1JetEtScaleRcd,frontier://FrontierProd/CMS_CONDITIONS',
-    # L1 CSCTF configuration used since Run2012B
-    'L1MuCSCPtLut_key-11_mc,L1MuCSCPtLutRcd,frontier://FrontierProd/CMS_CONDITIONS',
-    # L1 DTTF settings used since Run2012C
-    'L1MuDTTFParameters_dttf12_TSC_03_csc_col_mc,L1MuDTTFParametersRcd,frontier://FrontierProd/CMS_CONDITIONS',
-)
-
-autoCond['run1_mc']          = ( autoCond['run1_mc'], ) \
-                             + conditions_L1_Run2012D 
-
-autoCond['run1_mc_hi']       = ( autoCond['run1_mc_hi'], ) \
-                             + conditions_L1_Run2012D 
-
-autoCond['run1_mc_pa']       = ( autoCond['run1_mc_pa'], ) \
-                             + conditions_L1_Run2012D 
-
-autoCond['run1_hlt']         = ( autoCond['run1_hlt'], ) \
-                             + conditions_L1_Run2012D 
-
-autoCond['run1_data']        = ( autoCond['run1_data'], ) \
-                             + conditions_L1_Run2012D 
-
-autoCond['run2_mc']          = ( autoCond['run2_mc'], ) \
-                             + conditions_L1_Run2012D 
-
-autoCond['run2_mc_50ns']     = ( autoCond['run2_mc_50ns'], ) \
-                             + conditions_L1_Run2012D 
-
 # dedicated GlobalTags for MC production with the fixed HLT menus
 autoCond['run1_mc_2014']     = ( autoCond['run1_mc'] )
 autoCond['run1_mc_Fake']     = ( autoCond['run1_mc'] )
@@ -136,7 +100,7 @@
 autoCond['upgrade2019']      = ( autoCond['phase1_2019_design'] )
 autoCond['upgradePLS3']      = ( autoCond['phase2_design'] )
 
-### OLD KEYS ### for HLT                                                                                                                                          
+### OLD KEYS ### for HLT
 
 autoCond['startup_2014']     = ( autoCond['run1_mc_2014'] )
 autoCond['startup_GRun']     = ( autoCond['run1_mc_GRun'] )

diff --git a/DQM/Physics/python/topJetCorrectionHelper_cfi.py b/DQM/Physics/python/topJetCorrectionHelper_cfi.py
@@ -3,11 +3,11 @@
 #############################################################################
 ## Temporary due to bad naming of the jet algorithm in correction modules  ##
 from JetMETCorrections.Configuration.JetCorrectionServices_cff import ak4PFCHSL1Offset, ak4PFCHSL1Fastjet, ak4PFCHSL2Relative, ak4PFCHSL3Absolute, ak4PFCHSResidual, ak4PFCHSL2L3, ak4PFCHSL2L3Residual
-ak4PFCHSL1Offset.algorithm = 'AK5PFchs'
-ak4PFCHSL1Fastjet.algorithm = 'AK5PFchs'
-ak4PFCHSL2Relative.algorithm = 'AK5PFchs'
-ak4PFCHSL3Absolute.algorithm = 'AK5PFchs'
-ak4PFCHSResidual.algorithm = 'AK5PFchs'
+ak4PFCHSL1Offset.algorithm = 'AK4PFchs'
+ak4PFCHSL1Fastjet.algorithm = 'AK4PFchs'
+ak4PFCHSL2Relative.algorithm = 'AK4PFchs'
+ak4PFCHSL3Absolute.algorithm = 'AK4PFchs'
+ak4PFCHSResidual.algorithm = 'AK4PFchs'
 
 topDQMak5PFCHSL1Offset = ak4PFCHSL1Offset.clone()
 topDQMak5PFCHSL1Fastjet = ak4PFCHSL1Fastjet.clone()

diff --git a/DQMOffline/JetMET/python/jetAnalyzer_cfi.py b/DQMOffline/JetMET/python/jetAnalyzer_cfi.py
@@ -5,13 +5,10 @@
 
 
 from JetMETCorrections.Configuration.JetCorrectionServices_cff import ak4CaloL2L3,ak4CaloL2Relative,ak4CaloL3Absolute
-newAk4CaloL2L3 = ak4CaloL2L3.clone()
 
 from JetMETCorrections.Configuration.JetCorrectionServicesAllAlgos_cff import ak7CaloL2L3,ak7CaloL2Relative,ak7CaloL3Absolute
-newAk7CaloL2L3 = ak7CaloL2L3.clone()
 
 from JetMETCorrections.Configuration.JetCorrectionServices_cff import ak4PFL1FastL2L3,ak4PFL1Fastjet,ak4PFL2Relative,ak4PFL3Absolute
-newAk4PFL1FastL2L3 = ak4PFL1FastL2L3.clone()
 
 #from JetMETCorrections.Configuration.JetCorrectionServices_cff import ak4JPTL1FastL2L3,ak4JPTL1Fastjet,ak4JPTL2Relative,ak4JPTL3Absolute
 #newAk4JPTL1FastL2L3 = ak4JPTL1FastL2L3.clone()
@@ -20,7 +17,7 @@
     OutputMEsInRootFile = cms.bool(False),
     OutputFile = cms.string('jetMETMonitoring.root'),
     JetType = cms.string('calo'),#pf, calo or jpt
-    JetCorrections = cms.string("newAk4CaloL2L3"),
+    JetCorrections = cms.string("ak4CaloL2L3"),
     jetsrc = cms.InputTag("ak4CaloJets"),
     filljetHighLevel =cms.bool(True),
     #
@@ -121,7 +118,7 @@
     #for PFJets: FIRSTDATA
     JetIDVersion               = cms.string("FIRSTDATA"),
     JetType = cms.string('pf'),#pf, calo or jpt
-    JetCorrections = cms.string("newAk4PFL1FastL2L3"),
+    JetCorrections = cms.string("ak4PFL1FastL2L3"),
     jetsrc = cms.InputTag("ak4PFJets"),
     filljetHighLevel  = cms.bool(False),
     DCSFilterForJetMonitoring = cms.PSet(

diff --git a/DQMOffline/RecoB/python/bTagSequences_cff.py b/DQMOffline/RecoB/python/bTagSequences_cff.py
@@ -2,7 +2,7 @@
 
 #define you jet ID
 jetID = cms.InputTag("ak4PFJetsCHS")
-corr = 'ak4PFCHSL1FastL2L3'
+
 
 
 #JTA for your jets
@@ -48,17 +48,10 @@
 
 from JetMETCorrections.Configuration.DefaultJEC_cff import *
 from JetMETCorrections.Configuration.JetCorrectionServices_cff import *
-ak4PFCHSL1Fastjet.algorithm = 'AK4PFchs'
-ak4PFCHSL2Relative.algorithm = 'AK4PFchs'
-ak4PFCHSL3Absolute.algorithm = 'AK4PFchs'
-ak4PFCHSResidual.algorithm = 'AK4PFchs'
 
-ak4JetsJEC = ak4PFJetsL2L3.clone(
-        src = jetID,
-        correctors = [corr]        )
 
 PFJetsFilter = cms.EDFilter("PFJetSelector",
-                            src = cms.InputTag("ak4JetsJEC"),
+                            src = cms.InputTag("ak4PFJetsL2L3"),
                             cut = JetCut,
                             filter = cms.bool(True)
                             )
diff --git a/DQMOffline/RecoB/python/dqmAnalyzer_cff.py b/DQMOffline/RecoB/python/dqmAnalyzer_cff.py
@@ -5,27 +5,14 @@
 
 #JEC for CHS
 from JetMETCorrections.Configuration.JetCorrectionServices_cff import ak4PFCHSL1Fastjet, ak4PFCHSL2Relative, ak4PFCHSL3Absolute, ak4PFCHSResidual, ak4PFCHSL1FastL2L3, ak4PFCHSL1FastL2L3Residual
-newak4PFCHSL1Fastjet = ak4PFCHSL1Fastjet.clone(algorithm = 'AK5PFchs')
-newak4PFCHSL2Relative = ak4PFCHSL2Relative.clone(algorithm = 'AK5PFchs')
-newak4PFCHSL3Absolute = ak4PFCHSL3Absolute.clone(algorithm = 'AK5PFchs')
-newak4PFCHSResidual = ak4PFCHSResidual.clone(algorithm = 'AK5PFchs')
-
-newak4PFCHSL1FastL2L3 = ak4PFCHSL1FastL2L3.clone(correctors = cms.vstring('newak4PFCHSL1Fastjet','newak4PFCHSL2Relative','newak4PFCHSL3Absolute'))
-newak4PFCHSL1FastL2L3Residual = ak4PFCHSL1FastL2L3Residual.clone(correctors = cms.vstring('newak4PFCHSL1Fastjet','newak4PFCHSL2Relative','newak4PFCHSL3Absolute','newak4PFCHSResidual'))
-
-#Needed only for fastsim, why?
-ak4PFCHSL1Fastjet.algorithm = 'AK5PFchs'
-ak4PFCHSL2Relative.algorithm = 'AK5PFchs'
-ak4PFCHSL3Absolute.algorithm = 'AK5PFchs'
-ak4PFCHSResidual.algorithm = 'AK5PFchs'
 
 ######### DATA ############
 from DQMOffline.RecoB.bTagAnalysisData_cfi import *
 bTagAnalysis.ptRanges = cms.vdouble(0.0)
 bTagAnalysis.doJetID = True
 bTagAnalysis.doJEC = True
 #Residual correction will be added inside the c++ code only for data (checking the presence of genParticles collection), not explicit here as this sequence also ran on MC FullSim
-bTagAnalysis.JECsource = cms.string("newak4PFCHSL1FastL2L3") 
+bTagAnalysis.JECsource = cms.string("ak4PFCHSL1FastL2L3") 
 bTagPlotsDATA = cms.Sequence(bTagAnalysis)
 
 ########## MC ############
@@ -54,7 +41,7 @@
 bTagValidation.etaRanges = cms.vdouble(0.0)
 bTagValidation.doJetID = True
 bTagValidation.doJEC = True
-bTagValidation.JECsource = cms.string("newak4PFCHSL1FastL2L3")
+bTagValidation.JECsource = cms.string("ak4PFCHSL1FastL2L3")
 bTagValidation.genJetsMatched = cms.InputTag("newpatJetGenJetMatch")
 #to run on fastsim
 prebTagSequenceMC = cms.Sequence(ak4GenJetsForPUid*newpatJetGenJetMatch*myPartons*AK4Flavour)

diff --git a/FastSimulation/ParticleFlow/python/TauTaggingFastSimNeutralHadron_cff.py b/FastSimulation/ParticleFlow/python/TauTaggingFastSimNeutralHadron_cff.py
@@ -3,7 +3,7 @@
 # Tau tagging
 
 from RecoTauTag.Configuration.RecoPFTauTag_cff import *
-#recoTauAK5PFJets08Region.pfSrc = cms.InputTag("FSparticleFlow") # AG
+#recoTauAK4PFJets08Region.pfSrc = cms.InputTag("FSparticleFlow") # AG
 from RecoTauTag.RecoTau.RecoTauShrinkingConeProducer_cfi import _shrinkingConeRecoTausConfig
 #_shrinkingConeRecoTausConfig.pfCandSrc = cms.InputTag("FSparticleFlow") # AG
 from RecoTauTag.RecoTau.PFRecoTauTagInfoProducer_cfi import pfRecoTauTagInfoProducer