Adding AK5 to AK4 transition again, from scratch

cbernet · Oct 3, 2014 · 188e2e9 · 188e2e9
1 parent 4a44843
commit 188e2e9
Show file tree

Hide file tree

Showing 26 changed files with 796 additions and 316 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/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/RecoB/python/dqmAnalyzer_cff.py b/DQMOffline/RecoB/python/dqmAnalyzer_cff.py
@@ -5,19 +5,19 @@
 
 #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')
+newak4PFCHSL1Fastjet = ak4PFCHSL1Fastjet.clone(algorithm = 'AK4PFchs')
+newak4PFCHSL2Relative = ak4PFCHSL2Relative.clone(algorithm = 'AK4PFchs')
+newak4PFCHSL3Absolute = ak4PFCHSL3Absolute.clone(algorithm = 'AK4PFchs')
+newak4PFCHSResidual = ak4PFCHSResidual.clone(algorithm = 'AK4PFchs')
 
 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'
+ak4PFCHSL1Fastjet.algorithm = 'AK4PFchs'
+ak4PFCHSL2Relative.algorithm = 'AK4PFchs'
+ak4PFCHSL3Absolute.algorithm = 'AK4PFchs'
+ak4PFCHSResidual.algorithm = 'AK4PFchs'
 
 ######### DATA ############
 from DQMOffline.RecoB.bTagAnalysisData_cfi import *

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

diff --git a/HLTrigger/HLTanalyzers/python/HLT_ES_cff.py b/HLTrigger/HLTanalyzers/python/HLT_ES_cff.py
@@ -2749,13 +2749,13 @@
     'HcalCellDead' )
 )
 hcal_db_producer = cms.ESProducer( "HcalDbProducer" )
-hltESPAK5CaloL1L2L3 = cms.ESProducer( "JetCorrectionESChain",
+hltESPAK4CaloL1L2L3 = cms.ESProducer( "JetCorrectionESChain",
   correctors = cms.vstring( 'hltESPL1FastJetCorrectionESProducer',
     'hltESPL2RelativeCorrectionESProducer',
     'hltESPL3AbsoluteCorrectionESProducer' ),
   appendToDataLabel = cms.string( "" )
 )
-hltESPAK5CaloL2L3 = cms.ESProducer( "JetCorrectionESChain",
+hltESPAK4CaloL2L3 = cms.ESProducer( "JetCorrectionESChain",
   correctors = cms.vstring( 'hltESPL2RelativeCorrectionESProducer',
     'hltESPL3AbsoluteCorrectionESProducer' ),
   appendToDataLabel = cms.string( "" )
@@ -3148,17 +3148,17 @@
 hltESPL1FastJetCorrectionESProducer = cms.ESProducer( "L1FastjetCorrectionESProducer",
   appendToDataLabel = cms.string( "" ),
   srcRho = cms.InputTag( 'hltKT6CaloJets','rho' ),
-  algorithm = cms.string( "AK5Calo" ),
+  algorithm = cms.string( "AK4Calo" ),
   level = cms.string( "L1FastJet" )
 )
 hltESPL2RelativeCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
   appendToDataLabel = cms.string( "" ),
-  algorithm = cms.string( "AK5Calo" ),
+  algorithm = cms.string( "AK4Calo" ),
   level = cms.string( "L2Relative" )
 )
 hltESPL3AbsoluteCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
   appendToDataLabel = cms.string( "" ),
-  algorithm = cms.string( "AK5Calo" ),
+  algorithm = cms.string( "AK4Calo" ),
   level = cms.string( "L3Absolute" )
 )
 hltESPL3MuKFTrajectoryFitter = cms.ESProducer( "KFTrajectoryFitterESProducer",