Merge pull request #3631 from rappoccio/rappoccio_AK5_To_AK4_710pre7

ak5 to ak4 transition

CommonTools/ParticleFlow/python/EITopPAG_cff.py

@@ -10,14 +10,14 @@
 
 
 # sequential top projection cleaning
-from CommonTools.ParticleFlow.TopProjectors.pfNoMuon_cfi import * 
-from CommonTools.ParticleFlow.TopProjectors.pfNoElectron_cfi import * 
+from CommonTools.ParticleFlow.TopProjectors.pfNoMuon_cfi import *
+from CommonTools.ParticleFlow.TopProjectors.pfNoElectron_cfi import *
 from CommonTools.ParticleFlow.TopProjectors.pfNoJet_cfi import *
 from CommonTools.ParticleFlow.TopProjectors.pfNoTau_cfi import *
 
 
 # b-tagging
-from RecoJets.JetAssociationProducers.ak5JTA_cff import ak5JetTracksAssociatorAtVertex
+from RecoJets.JetAssociationProducers.ak4JTA_cff import ak4JetTracksAssociatorAtVertex
 from RecoBTag.ImpactParameter.impactParameter_cfi import impactParameterTagInfos
 from RecoBTag.SecondaryVertex.secondaryVertexTagInfos_cfi import secondaryVertexTagInfos
 from RecoBTag.SecondaryVertex.combinedSecondaryVertexBJetTags_cfi import combinedSecondaryVertexBJetTags
@@ -55,7 +55,7 @@
     (muonRef.pfIsolationR04().sumChargedHadronPt+
     max(0.,muonRef.pfIsolationR04().sumNeutralHadronEt+
     muonRef.pfIsolationR04().sumPhotonEt-
-    0.50*muonRef.pfIsolationR04().sumPUPt))/pt < 0.20 && 
+    0.50*muonRef.pfIsolationR04().sumPUPt))/pt < 0.20 &&
     (muonRef.isPFMuon && (muonRef.isGlobalMuon || muonRef.isTrackerMuon) )'''
     ),
     makeClones = cms.bool(True)
@@ -135,7 +135,7 @@
     )
 
 #### B-tagging ####
-pfJetTrackAssociatorEI = ak5JetTracksAssociatorAtVertex.clone (
+pfJetTrackAssociatorEI = ak4JetTracksAssociatorAtVertex.clone (
     src = cms.InputTag("pfJetsEI")
     )
 impactParameterTagInfosEI = impactParameterTagInfos.clone(
@@ -146,7 +146,7 @@
     )
 combinedSecondaryVertexBJetTagsEI = combinedSecondaryVertexBJetTags.clone(
     tagInfos = cms.VInputTag(cms.InputTag("impactParameterTagInfosEI"),
-                             cms.InputTag("secondaryVertexTagInfosEI"))    
+                             cms.InputTag("secondaryVertexTagInfosEI"))
     )
 
 
@@ -159,25 +159,25 @@
     pfPileUpEI +
     pfPileUpJMEEI +
     pfNoPileUpEI +
-    pfNoPileUpJMEEI + 
+    pfNoPileUpJMEEI +
     pfAllMuonsEI +
-    pfMuonsFromVertexEI + 
+    pfMuonsFromVertexEI +
     pfIsolatedMuonsEI +
     pfNoMuon +
     pfNoMuonJME +
     pfAllElectronsEI +
-    pfElectronsFromVertexEI + 
-    pfIsolatedElectronsEI +    
+    pfElectronsFromVertexEI +
+    pfIsolatedElectronsEI +
     pfNoElectron +
     pfNoElectronJME +
     pfJetSequenceEI +
-    pfNoJetEI + 
+    pfNoJetEI +
     pfTauEISequence +
     pfNoTauEI +
     pfMetEI+
     pfJetTrackAssociatorEI+
     impactParameterTagInfosEI+
     secondaryVertexTagInfosEI+
-    combinedSecondaryVertexBJetTagsEI    
+    combinedSecondaryVertexBJetTagsEI
     )
 

CommonTools/ParticleFlow/python/Tools/jetTools.py

@@ -1,23 +1,23 @@
 import FWCore.ParameterSet.Config as cms
 
-import RecoJets.JetProducers.ak5PFJets_cfi
+import RecoJets.JetProducers.ak4PFJets_cfi
 import RecoJets.JetProducers.ic5PFJets_cfi
 
 def jetAlgo( algo ):
-    
+
     # print 'PF2PAT: selecting jet algorithm ', algo
-    
+
     if algo == 'IC5':
 #allPfJets = RecoJets.JetProducers.ic5PFJets_cfi.iterativeCone5PFJets.clone()
         jetAlgo = RecoJets.JetProducers.ic5PFJets_cfi.iterativeCone5PFJets.clone()
-    elif algo == 'AK5':
-        jetAlgo = RecoJets.JetProducers.ak5PFJets_cfi.ak5PFJets.clone()
+    elif algo == 'AK4':
+        jetAlgo = RecoJets.JetProducers.ak4PFJets_cfi.ak4PFJets.clone()
     elif algo == 'AK7':
-        jetAlgo = RecoJets.JetProducers.ak5PFJets_cfi.ak5PFJets.clone()    
+        jetAlgo = RecoJets.JetProducers.ak4PFJets_cfi.ak4PFJets.clone()
         jetAlgo.rParam = cms.double(0.7)
         jetAlgo.doAreaFastjet = cms.bool(False)
-        
+
     jetAlgo.src = 'pfNoElectronJME'
     jetAlgo.doPVCorrection = True
     jetAlgo.srcPVs = cms.InputTag("goodOfflinePrimaryVertices")
-    return jetAlgo    
+    return jetAlgo

CommonTools/ParticleFlow/python/genForPF2PAT_cff.py

@@ -8,6 +8,6 @@
 genForPF2PATSequence = cms.Sequence(
     genParticlesForJetsNoNu +
     iterativeCone5GenJetsNoNu +
-    ak5GenJetsNoNu +
+    ak4GenJetsNoNu +
     ak8GenJetsNoNu
     )

CommonTools/ParticleFlow/python/pfJets_cff.py

@@ -5,7 +5,7 @@
 
 
 #allPfJets = RecoJets.JetProducers.ic5PFJets_cfi.iterativeCone5PFJets.clone()
-pfJets = jetAlgo('AK5')
+pfJets = jetAlgo('AK4')
 
 pfJetsPtrs = cms.EDProducer("PFJetFwdPtrProducer",
                             src=cms.InputTag("pfJets")

CommonTools/ParticleFlow/python/pfMET_cfi.py

@@ -1,14 +1,14 @@
 import FWCore.ParameterSet.Config as cms
 
-# Clone pfMET producer from RecoMET  
+# Clone pfMET producer from RecoMET
 from RecoMET.METProducers.PFMET_cfi import *
 
 # Should the name be changed se it is similar to pfMet from reco ??
 pfMET = pfMet.clone(alias="pfMET")
 
 # Use PF2PAT cleaned jet collection (pfJets) for MET significance
-# instead of standard collection (ak5PFJets)?
+# instead of standard collection (ak4PFJets)?
 # It requires that MET is produced at the end.
 pfMET.jets = cms.InputTag("pfJets")
 
-# print 'PF2PAT: Jet collection used for pfMET significance: ', pfMET.jets 
+# print 'PF2PAT: Jet collection used for pfMET significance: ', pfMET.jets

CommonTools/ParticleFlow/python/pfTaus_cff.py

@@ -4,9 +4,9 @@
 from RecoTauTag.TauTagTools.PFTauSelector_cfi  import pfTauSelector
 import RecoTauTag.RecoTau.RecoTauCleanerPlugins as cleaners
 #from CommonTools.ParticleFlow.pfJets_cff import pfJets
-from RecoJets.JetProducers.ak5PFJets_cfi import ak5PFJets
+from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJets
 
-''' 
+'''
 
 pfTaus_cff
 
@@ -29,24 +29,24 @@
 
 # PiZeroProducers
 
-pfJetsLegacyHPSPiZeros = ak5PFJetsLegacyHPSPiZeros.clone()
+pfJetsLegacyHPSPiZeros = ak4PFJetsLegacyHPSPiZeros.clone()
 
-pfJetsLegacyHPSPiZeros.jetSrc = cms.InputTag("ak5PFJets")
+pfJetsLegacyHPSPiZeros.jetSrc = cms.InputTag("ak4PFJets")
 
-pfTauPFJets08Region = recoTauAK5PFJets08Region.clone()
-pfTauPFJetsRecoTauChargedHadrons = ak5PFJetsRecoTauChargedHadrons.clone()
-pfTauPFJets08Region.src = cms.InputTag("ak5PFJets")
+pfTauPFJets08Region = recoTauAK4PFJets08Region.clone()
+pfTauPFJets08Region.src = cms.InputTag("ak4PFJets")
+pfTauPFJetsRecoTauChargedHadrons = ak4PFJetsRecoTauChargedHadrons.clone()
 pfTauPFJets08Region.pfSrc = cms.InputTag("particleFlow")
 pfTauPFJetsRecoTauChargedHadrons.jetRegionSrc = 'pfTauPFJets08Region'
 
 pfTauTagInfoProducer = pfRecoTauTagInfoProducer.clone()
-pfTauTagInfoProducer.PFCandidateProducer = ak5PFJets.src
+pfTauTagInfoProducer.PFCandidateProducer = ak4PFJets.src
 pfTauTagInfoProducer.PFJetTracksAssociatorProducer = 'pfJetTracksAssociatorAtVertex'
 
 # Clone tau producer
 pfTausProducer = hpsPFTauProducer.clone()
 pfTausCombiner = combinatoricRecoTaus.clone()
-pfTausCombiner.jetSrc= cms.InputTag("ak5PFJets")
+pfTausCombiner.jetSrc= cms.InputTag("ak4PFJets")
 pfTausCombiner.piZeroSrc= "pfJetsLegacyHPSPiZeros"
 pfTausCombiner.jetRegionSrc='pfTauPFJets08Region'
 pfTausCombiner.chargedHadronSrc='pfTauPFJetsRecoTauChargedHadrons'
@@ -112,8 +112,8 @@
 
 # Associate track to pfJets
 #from RecoJets.JetAssociationProducers.j2tParametersVX_cfi import *
-pfJetTracksAssociatorAtVertex = ak5PFJetTracksAssociatorAtVertex.clone()
-pfJetTracksAssociatorAtVertex.jets= cms.InputTag("ak5PFJets")
+pfJetTracksAssociatorAtVertex = ak4PFJetTracksAssociatorAtVertex.clone()
+pfJetTracksAssociatorAtVertex.jets= cms.InputTag("ak4PFJets")
 
 pfTauPileUpVertices = cms.EDFilter(
     "RecoTauPileUpVertexSelector",
@@ -124,12 +124,12 @@
 
 
 pfTauTagInfoProducer = pfRecoTauTagInfoProducer.clone()
-pfTauTagInfoProducer.PFCandidateProducer = ak5PFJets.src
+pfTauTagInfoProducer.PFCandidateProducer = ak4PFJets.src
 pfTauTagInfoProducer.PFJetTracksAssociatorProducer = 'pfJetTracksAssociatorAtVertex'
 
 
 pfTausPreSequence = cms.Sequence(
-    pfJetTracksAssociatorAtVertex + 
+    pfJetTracksAssociatorAtVertex +
     pfTauPFJets08Region +
     pfTauPileUpVertices +
     pfTauTagInfoProducer

CommonTools/ParticleFlow/python/pfType1MET_cfi.py

@@ -4,10 +4,10 @@
 # remember about including ES producer definition e.g. JetMETCorrections.Configuration.L2L3Corrections_Summer08Redigi_cff
 
 pfType1MET = cms.EDProducer("Type1PFMET",
-    inputUncorJetsTag = cms.InputTag("ak5PFJets"),
+    inputUncorJetsTag = cms.InputTag("ak4PFJets"),
     jetEMfracLimit = cms.double(0.95), # to remove electron which give rise to jets
     jetMufracLimit = cms.double(0.95), # to remove electron which give rise to jets
-    metType = cms.string("PFMET"), 
+    metType = cms.string("PFMET"),
     jetPTthreshold = cms.double(20.0),
     # pfMET should be not corrected for HF 0.7
     inputUncorMetLabel = cms.string("pfMET"),

CommonTools/RecoAlgos/python/HBHENoiseFilterResultProducer_cfi.py

@@ -17,7 +17,7 @@
     minIsolatedNoiseSumEt = cms.double(25.0),
     useTS4TS5 = cms.bool(True),
     IgnoreTS4TS5ifJetInLowBVRegion=cms.bool(True),
-    jetlabel = cms.InputTag('ak5PFJets'),
+    jetlabel = cms.InputTag('ak4PFJets'),
     maxjetindex = cms.int32(0), # maximum jet index that will be checked for 'IgnoreTS4TS5ifJetInLowBVRegion'
     maxNHF = cms.double(0.9) # maximum allowed jet->neutralHadronEnergyFraction() for a jet in low BV region to be considered 'good' (and thus skip the noise check)
     )

CommonTools/RecoAlgos/python/HBHENoiseFilter_cfi.py

@@ -16,8 +16,8 @@
     minIsolatedNoiseSumE = cms.double(50.0),
     minIsolatedNoiseSumEt = cms.double(25.0),
     useTS4TS5 = cms.bool(True),
-    IgnoreTS4TS5ifJetInLowBVRegion=cms.bool(True), 
-    jetlabel = cms.InputTag('ak5PFJets'),
+    IgnoreTS4TS5ifJetInLowBVRegion=cms.bool(True),
+    jetlabel = cms.InputTag('ak4PFJets'),
     maxjetindex = cms.int32(0), # maximum jet index that will be checked for 'IgnoreTS4TS5ifJetInLowBVRegion'
     maxNHF = cms.double(0.9) # maximum allowed jet->neutralHadronEnergyFraction()
     )

Configuration/EventContent/python/EventContent_cff.py

@@ -718,7 +718,7 @@
       'drop *_kt4GenJets_*_*',
       'drop *_kt6GenJets_*_*',
       'drop *_iterativeCone5GenJets_*_*',
-      'drop *_ak5GenJets_*_*',
+      'drop *_ak4GenJets_*_*',
       'drop *_ak7GenJets_*_*',
       'drop *_genCandidatesForMET_*_*',
       'drop *_genParticlesForMETAllVisible_*_*',

Configuration/Skimming/python/PDWG_DiJetAODSkim_cff.py

@@ -16,24 +16,24 @@
         #------- CaloJet collections ------
         'keep recoCaloJets_kt4CaloJets_*_*',
         'keep recoCaloJets_kt6CaloJets_*_*',
-        'keep recoCaloJets_ak5CaloJets_*_*',
+        'keep recoCaloJets_ak4CaloJets_*_*',
         'keep recoCaloJets_ak7CaloJets_*_*',
         'keep recoCaloJets_iterativeCone5CaloJets_*_*',
         #------- CaloJet ID ---------------
         'keep *_kt4JetID_*_*',
         'keep *_kt6JetID_*_*',
-        'keep *_ak5JetID_*_*',
+        'keep *_ak4JetID_*_*',
         'keep *_ak7JetID_*_*',
-        'keep *_ic5JetID_*_*', 
-        #------- PFJet collections ------  
+        'keep *_ic5JetID_*_*',
+        #------- PFJet collections ------
         'keep recoPFJets_kt4PFJets_*_*',
         'keep recoPFJets_kt6PFJets_*_*',
-        'keep recoPFJets_ak5PFJets_*_*',
+        'keep recoPFJets_ak4PFJets_*_*',
         'keep recoPFJets_ak7PFJets_*_*',
         'keep recoPFJets_iterativeCone5PFJets_*_*',
         #------- JPTJet collections ------
         'keep *_JetPlusTrackZSPCorJetAntiKt5_*_*',
-        #'keep *_ak5JPTJets_*_*',
+        #'keep *_ak4JPTJets_*_*',
         #'keep *_iterativeCone5JPTJets_*_*',
         #------- Trigger collections ------
         'keep edmTriggerResults_TriggerResults_*_*',
@@ -51,7 +51,7 @@
         #------- MET collections ----------
         'keep *_metHO_*_*',
         'keep *_metNoHF_*_*',
-        'keep *_metNoHFHO_*_*', 
-        'keep *_met_*_*')    
+        'keep *_metNoHFHO_*_*',
+        'keep *_met_*_*')
 )
 

Configuration/Skimming/python/PDWG_EXOHSCP_cff.py

@@ -1,4 +1,4 @@
-TRACK_PT = 20.0  
+TRACK_PT = 20.0
 import FWCore.ParameterSet.Config as cms
 import Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi
 
@@ -111,7 +111,7 @@
 									 recHitsLabel = cms.InputTag("hbhereco",""),
 									 TrackAssociatorParameters=TrackAssociatorParameterBlock.TrackAssociatorParameters,
 									 inputCollection = cms.InputTag("generalTracksSkim"),
-									 TrackPt=cms.double(TRACK_PT),					   
+									 TrackPt=cms.double(TRACK_PT),
 									 reducedHitsCollection = cms.string('')
 )
 
@@ -163,7 +163,7 @@
   trackIsoOffsetEB = cms.double(2.),
   trackIsoSlopeEB =  cms.double(0.001),
   etaWidthEB  = cms.double(0.013),
-                                  
+
   ecalisoOffsetEE = cms.double(4.2),
   ecalisoSlopeEE = cms.double(0.006),
   hcalisoOffsetEE = cms.double(2.2),
@@ -173,9 +173,9 @@
   trackIsoOffsetEE = cms.double(2.),
   trackIsoSlopeEE =  cms.double(0.001),
   etaWidthEE  = cms.double(0.03),
-
 
-
+
+
 )
 
 
@@ -213,7 +213,7 @@
       'keep *_HSCPIsolation01__*',
       'keep *_HSCPIsolation03__*',
       'keep *_HSCPIsolation05__*',
-      'keep recoPFJets_ak5PFJets__*', 
+      'keep recoPFJets_ak4PFJets__*',
       'keep recoPFMETs_pfMet__*',
       'keep recoBeamSpot_offlineBeamSpot__*',
       )

Configuration/Skimming/python/PDWG_LeptonSkim_cff.py

@@ -3,16 +3,16 @@
 from JetMETCorrections.Configuration.DefaultJEC_cff import *
 from Configuration.Skimming.pdwgLeptonRecoSkim_cfi import *
 
-from Configuration.Skimming.pdwgSingleMu_cfi import * 
-from Configuration.Skimming.pdwgDoubleMu_cfi import * 
-from Configuration.Skimming.pdwgMuonElectron_cfi import * 
-from Configuration.Skimming.pdwgMuonPFElectron_cfi import * 
+from Configuration.Skimming.pdwgSingleMu_cfi import *
+from Configuration.Skimming.pdwgDoubleMu_cfi import *
+from Configuration.Skimming.pdwgMuonElectron_cfi import *
+from Configuration.Skimming.pdwgMuonPFElectron_cfi import *
 from Configuration.Skimming.pdwgDoubleElectron_cfi import *
 from Configuration.Skimming.pdwgDoublePFElectron_cfi import *
 
-filterSingleMu         = cms.Sequence(ak5CaloJetsL2L3+ak5PFJetsL2L3+SingleMu)
-filterDoubleMu         = cms.Sequence(ak5CaloJetsL2L3+ak5PFJetsL2L3+DoubleMu)
-filterMuonElectron     = cms.Sequence(ak5CaloJetsL2L3+ak5PFJetsL2L3+MuonElectron)
-filterMuonPFElectron   = cms.Sequence(ak5CaloJetsL2L3+ak5PFJetsL2L3+MuonPFElectron)
-filterDoubleElectron   = cms.Sequence(ak5CaloJetsL2L3+ak5PFJetsL2L3+DoubleElectron)
-filterDoublePFElectron = cms.Sequence(ak5CaloJetsL2L3+ak5PFJetsL2L3+DoublePFElectron)
+filterSingleMu         = cms.Sequence(ak4CaloJetsL2L3+ak4PFJetsL2L3+SingleMu)
+filterDoubleMu         = cms.Sequence(ak4CaloJetsL2L3+ak4PFJetsL2L3+DoubleMu)
+filterMuonElectron     = cms.Sequence(ak4CaloJetsL2L3+ak4PFJetsL2L3+MuonElectron)
+filterMuonPFElectron   = cms.Sequence(ak4CaloJetsL2L3+ak4PFJetsL2L3+MuonPFElectron)
+filterDoubleElectron   = cms.Sequence(ak4CaloJetsL2L3+ak4PFJetsL2L3+DoubleElectron)
+filterDoublePFElectron = cms.Sequence(ak4CaloJetsL2L3+ak4PFJetsL2L3+DoublePFElectron)

Configuration/Skimming/python/pdwgLeptonRecoSkim_cfi.py

@@ -5,16 +5,16 @@
   electronCollection      = cms.InputTag("gedGsfElectrons"),
   pfElectronCollection    = cms.InputTag("particleFlow"),
   muonCollection          = cms.InputTag("muons"),
-  caloJetCollection       = cms.InputTag("ak5CaloJetsL2L3"),
-  PFJetCollection         = cms.InputTag("ak5PFJetsL2L3"),
+  caloJetCollection       = cms.InputTag("ak4CaloJetsL2L3"),
+  PFJetCollection         = cms.InputTag("ak4PFJetsL2L3"),
   ecalBarrelRecHitsCollection = cms.InputTag('ecalRecHit', 'EcalRecHitsEB'),
   ecalEndcapRecHitsCollection = cms.InputTag('ecalRecHit', 'EcalRecHitsEE'),
   UseElectronSelection    = cms.bool(False),
   UsePfElectronSelection  = cms.bool(False),
   UseMuonSelection        = cms.bool(False),
   UseHtSelection          = cms.bool(False),
   UsePFHtSelection          = cms.bool(False),
-  UseJetSelection         = cms.bool(False),                              
+  UseJetSelection         = cms.bool(False),
   FilterName              = cms.string("None"),
   electronPtMin           = cms.double(0),
   electronN               = cms.int32(0),

Configuration/Skimming/test/CSmaker_JetMETAOD_PDJetMET_35e29_cfg.py

@@ -83,7 +83,7 @@
         'keep recoPFJets_iterativeCone5PFJets_*_*',
         #------- JPTJet collections ------
         'keep *_JetPlusTrackZSPCorJetAntiKt5_*_*',
-        #'keep *_ak5JPTJets_*_*',
+        #'keep *_ak4JPTJets_*_*',
         #'keep *_iterativeCone5JPTJets_*_*',
         #------- Trigger collections ------
         'keep edmTriggerResults_TriggerResults_*_*',