Skip to content

Commit 28cae92

Browse files
rappocciorappoccio
committed
Changing AK5 to AK4 in 710pre7
2 parents 44b7eb1 + 5965c42 commit 28cae92

File tree

185 files changed

+7045
-6790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+7045
-6790
lines changed

‎CommonTools/ParticleFlow/python/EITopPAG_cff.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111

1212
# sequential top projection cleaning
13-
from CommonTools.ParticleFlow.TopProjectors.pfNoMuon_cfi import *
14-
from CommonTools.ParticleFlow.TopProjectors.pfNoElectron_cfi import *
13+
from CommonTools.ParticleFlow.TopProjectors.pfNoMuon_cfi import *
14+
from CommonTools.ParticleFlow.TopProjectors.pfNoElectron_cfi import *
1515
from CommonTools.ParticleFlow.TopProjectors.pfNoJet_cfi import *
1616
from CommonTools.ParticleFlow.TopProjectors.pfNoTau_cfi import *
1717

1818

1919
# b-tagging
20-
from RecoJets.JetAssociationProducers.ak5JTA_cff import ak5JetTracksAssociatorAtVertex
20+
from RecoJets.JetAssociationProducers.ak4JTA_cff import ak4JetTracksAssociatorAtVertex
2121
from RecoBTag.ImpactParameter.impactParameter_cfi import impactParameterTagInfos
2222
from RecoBTag.SecondaryVertex.secondaryVertexTagInfos_cfi import secondaryVertexTagInfos
2323
from RecoBTag.SecondaryVertex.combinedSecondaryVertexBJetTags_cfi import combinedSecondaryVertexBJetTags
@@ -55,7 +55,7 @@
5555
(muonRef.pfIsolationR04().sumChargedHadronPt+
5656
max(0.,muonRef.pfIsolationR04().sumNeutralHadronEt+
5757
muonRef.pfIsolationR04().sumPhotonEt-
58-
0.50*muonRef.pfIsolationR04().sumPUPt))/pt < 0.20 &&
58+
0.50*muonRef.pfIsolationR04().sumPUPt))/pt < 0.20 &&
5959
(muonRef.isPFMuon && (muonRef.isGlobalMuon || muonRef.isTrackerMuon) )'''
6060
),
6161
makeClones = cms.bool(True)
@@ -135,7 +135,7 @@
135135
)
136136

137137
#### B-tagging ####
138-
pfJetTrackAssociatorEI = ak5JetTracksAssociatorAtVertex.clone (
138+
pfJetTrackAssociatorEI = ak4JetTracksAssociatorAtVertex.clone (
139139
src = cms.InputTag("pfJetsEI")
140140
)
141141
impactParameterTagInfosEI = impactParameterTagInfos.clone(
@@ -146,7 +146,7 @@
146146
)
147147
combinedSecondaryVertexBJetTagsEI = combinedSecondaryVertexBJetTags.clone(
148148
tagInfos = cms.VInputTag(cms.InputTag("impactParameterTagInfosEI"),
149-
cms.InputTag("secondaryVertexTagInfosEI"))
149+
cms.InputTag("secondaryVertexTagInfosEI"))
150150
)
151151

152152

@@ -159,25 +159,25 @@
159159
pfPileUpEI +
160160
pfPileUpJMEEI +
161161
pfNoPileUpEI +
162-
pfNoPileUpJMEEI +
162+
pfNoPileUpJMEEI +
163163
pfAllMuonsEI +
164-
pfMuonsFromVertexEI +
164+
pfMuonsFromVertexEI +
165165
pfIsolatedMuonsEI +
166166
pfNoMuon +
167167
pfNoMuonJME +
168168
pfAllElectronsEI +
169-
pfElectronsFromVertexEI +
170-
pfIsolatedElectronsEI +
169+
pfElectronsFromVertexEI +
170+
pfIsolatedElectronsEI +
171171
pfNoElectron +
172172
pfNoElectronJME +
173173
pfJetSequenceEI +
174-
pfNoJetEI +
174+
pfNoJetEI +
175175
pfTauEISequence +
176176
pfNoTauEI +
177177
pfMetEI+
178178
pfJetTrackAssociatorEI+
179179
impactParameterTagInfosEI+
180180
secondaryVertexTagInfosEI+
181-
combinedSecondaryVertexBJetTagsEI
181+
combinedSecondaryVertexBJetTagsEI
182182
)
183183

‎CommonTools/ParticleFlow/python/Tools/jetTools.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
import RecoJets.JetProducers.ak5PFJets_cfi
3+
import RecoJets.JetProducers.ak4PFJets_cfi
44
import RecoJets.JetProducers.ic5PFJets_cfi
55

66
def jetAlgo( algo ):
7-
7+
88
# print 'PF2PAT: selecting jet algorithm ', algo
9-
9+
1010
if algo == 'IC5':
1111
#allPfJets = RecoJets.JetProducers.ic5PFJets_cfi.iterativeCone5PFJets.clone()
1212
jetAlgo = RecoJets.JetProducers.ic5PFJets_cfi.iterativeCone5PFJets.clone()
13-
elif algo == 'AK5':
14-
jetAlgo = RecoJets.JetProducers.ak5PFJets_cfi.ak5PFJets.clone()
13+
elif algo == 'AK4':
14+
jetAlgo = RecoJets.JetProducers.ak4PFJets_cfi.ak4PFJets.clone()
1515
elif algo == 'AK7':
16-
jetAlgo = RecoJets.JetProducers.ak5PFJets_cfi.ak5PFJets.clone()
16+
jetAlgo = RecoJets.JetProducers.ak4PFJets_cfi.ak4PFJets.clone()
1717
jetAlgo.rParam = cms.double(0.7)
1818
jetAlgo.doAreaFastjet = cms.bool(False)
19-
19+
2020
jetAlgo.src = 'pfNoElectronJME'
2121
jetAlgo.doPVCorrection = True
2222
jetAlgo.srcPVs = cms.InputTag("goodOfflinePrimaryVertices")
23-
return jetAlgo
23+
return jetAlgo

‎CommonTools/ParticleFlow/python/genForPF2PAT_cff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
genForPF2PATSequence = cms.Sequence(
99
genParticlesForJetsNoNu +
1010
iterativeCone5GenJetsNoNu +
11-
ak5GenJetsNoNu +
11+
ak4GenJetsNoNu +
1212
ak8GenJetsNoNu
1313
)

‎CommonTools/ParticleFlow/python/pfJets_cff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
#allPfJets = RecoJets.JetProducers.ic5PFJets_cfi.iterativeCone5PFJets.clone()
8-
pfJets = jetAlgo('AK5')
8+
pfJets = jetAlgo('AK4')
99

1010
pfJetsPtrs = cms.EDProducer("PFJetFwdPtrProducer",
1111
src=cms.InputTag("pfJets")

‎CommonTools/ParticleFlow/python/pfMET_cfi.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
# Clone pfMET producer from RecoMET
3+
# Clone pfMET producer from RecoMET
44
from RecoMET.METProducers.PFMET_cfi import *
55

66
# Should the name be changed se it is similar to pfMet from reco ??
77
pfMET = pfMet.clone(alias="pfMET")
88

99
# Use PF2PAT cleaned jet collection (pfJets) for MET significance
10-
# instead of standard collection (ak5PFJets)?
10+
# instead of standard collection (ak4PFJets)?
1111
# It requires that MET is produced at the end.
1212
pfMET.jets = cms.InputTag("pfJets")
1313

14-
# print 'PF2PAT: Jet collection used for pfMET significance: ', pfMET.jets
14+
# print 'PF2PAT: Jet collection used for pfMET significance: ', pfMET.jets

‎CommonTools/ParticleFlow/python/pfTaus_cff.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
from RecoTauTag.TauTagTools.PFTauSelector_cfi import pfTauSelector
55
import RecoTauTag.RecoTau.RecoTauCleanerPlugins as cleaners
66
#from CommonTools.ParticleFlow.pfJets_cff import pfJets
7-
from RecoJets.JetProducers.ak5PFJets_cfi import ak5PFJets
7+
from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJets
88

9-
'''
9+
'''
1010
1111
pfTaus_cff
1212
@@ -29,24 +29,24 @@
2929

3030
# PiZeroProducers
3131

32-
pfJetsLegacyHPSPiZeros = ak5PFJetsLegacyHPSPiZeros.clone()
32+
pfJetsLegacyHPSPiZeros = ak4PFJetsLegacyHPSPiZeros.clone()
3333

34-
pfJetsLegacyHPSPiZeros.jetSrc = cms.InputTag("ak5PFJets")
34+
pfJetsLegacyHPSPiZeros.jetSrc = cms.InputTag("ak4PFJets")
3535

36-
pfTauPFJets08Region = recoTauAK5PFJets08Region.clone()
37-
pfTauPFJetsRecoTauChargedHadrons = ak5PFJetsRecoTauChargedHadrons.clone()
38-
pfTauPFJets08Region.src = cms.InputTag("ak5PFJets")
36+
pfTauPFJets08Region = recoTauAK4PFJets08Region.clone()
37+
pfTauPFJets08Region.src = cms.InputTag("ak4PFJets")
38+
pfTauPFJetsRecoTauChargedHadrons = ak4PFJetsRecoTauChargedHadrons.clone()
3939
pfTauPFJets08Region.pfSrc = cms.InputTag("particleFlow")
4040
pfTauPFJetsRecoTauChargedHadrons.jetRegionSrc = 'pfTauPFJets08Region'
4141

4242
pfTauTagInfoProducer = pfRecoTauTagInfoProducer.clone()
43-
pfTauTagInfoProducer.PFCandidateProducer = ak5PFJets.src
43+
pfTauTagInfoProducer.PFCandidateProducer = ak4PFJets.src
4444
pfTauTagInfoProducer.PFJetTracksAssociatorProducer = 'pfJetTracksAssociatorAtVertex'
4545

4646
# Clone tau producer
4747
pfTausProducer = hpsPFTauProducer.clone()
4848
pfTausCombiner = combinatoricRecoTaus.clone()
49-
pfTausCombiner.jetSrc= cms.InputTag("ak5PFJets")
49+
pfTausCombiner.jetSrc= cms.InputTag("ak4PFJets")
5050
pfTausCombiner.piZeroSrc= "pfJetsLegacyHPSPiZeros"
5151
pfTausCombiner.jetRegionSrc='pfTauPFJets08Region'
5252
pfTausCombiner.chargedHadronSrc='pfTauPFJetsRecoTauChargedHadrons'
@@ -112,8 +112,8 @@
112112

113113
# Associate track to pfJets
114114
#from RecoJets.JetAssociationProducers.j2tParametersVX_cfi import *
115-
pfJetTracksAssociatorAtVertex = ak5PFJetTracksAssociatorAtVertex.clone()
116-
pfJetTracksAssociatorAtVertex.jets= cms.InputTag("ak5PFJets")
115+
pfJetTracksAssociatorAtVertex = ak4PFJetTracksAssociatorAtVertex.clone()
116+
pfJetTracksAssociatorAtVertex.jets= cms.InputTag("ak4PFJets")
117117

118118
pfTauPileUpVertices = cms.EDFilter(
119119
"RecoTauPileUpVertexSelector",
@@ -124,12 +124,12 @@
124124

125125

126126
pfTauTagInfoProducer = pfRecoTauTagInfoProducer.clone()
127-
pfTauTagInfoProducer.PFCandidateProducer = ak5PFJets.src
127+
pfTauTagInfoProducer.PFCandidateProducer = ak4PFJets.src
128128
pfTauTagInfoProducer.PFJetTracksAssociatorProducer = 'pfJetTracksAssociatorAtVertex'
129129

130130

131131
pfTausPreSequence = cms.Sequence(
132-
pfJetTracksAssociatorAtVertex +
132+
pfJetTracksAssociatorAtVertex +
133133
pfTauPFJets08Region +
134134
pfTauPileUpVertices +
135135
pfTauTagInfoProducer

‎CommonTools/ParticleFlow/python/pfType1MET_cfi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# remember about including ES producer definition e.g. JetMETCorrections.Configuration.L2L3Corrections_Summer08Redigi_cff
55

66
pfType1MET = cms.EDProducer("Type1PFMET",
7-
inputUncorJetsTag = cms.InputTag("ak5PFJets"),
7+
inputUncorJetsTag = cms.InputTag("ak4PFJets"),
88
jetEMfracLimit = cms.double(0.95), # to remove electron which give rise to jets
99
jetMufracLimit = cms.double(0.95), # to remove electron which give rise to jets
10-
metType = cms.string("PFMET"),
10+
metType = cms.string("PFMET"),
1111
jetPTthreshold = cms.double(20.0),
1212
# pfMET should be not corrected for HF 0.7
1313
inputUncorMetLabel = cms.string("pfMET"),

‎CommonTools/RecoAlgos/python/HBHENoiseFilterResultProducer_cfi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
minIsolatedNoiseSumEt = cms.double(25.0),
1818
useTS4TS5 = cms.bool(True),
1919
IgnoreTS4TS5ifJetInLowBVRegion=cms.bool(True),
20-
jetlabel = cms.InputTag('ak5PFJets'),
20+
jetlabel = cms.InputTag('ak4PFJets'),
2121
maxjetindex = cms.int32(0), # maximum jet index that will be checked for 'IgnoreTS4TS5ifJetInLowBVRegion'
2222
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)
2323
)

‎CommonTools/RecoAlgos/python/HBHENoiseFilter_cfi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
minIsolatedNoiseSumE = cms.double(50.0),
1717
minIsolatedNoiseSumEt = cms.double(25.0),
1818
useTS4TS5 = cms.bool(True),
19-
IgnoreTS4TS5ifJetInLowBVRegion=cms.bool(True),
20-
jetlabel = cms.InputTag('ak5PFJets'),
19+
IgnoreTS4TS5ifJetInLowBVRegion=cms.bool(True),
20+
jetlabel = cms.InputTag('ak4PFJets'),
2121
maxjetindex = cms.int32(0), # maximum jet index that will be checked for 'IgnoreTS4TS5ifJetInLowBVRegion'
2222
maxNHF = cms.double(0.9) # maximum allowed jet->neutralHadronEnergyFraction()
2323
)

‎Configuration/EventContent/python/EventContent_cff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@
736736
'drop *_kt4GenJets_*_*',
737737
'drop *_kt6GenJets_*_*',
738738
'drop *_iterativeCone5GenJets_*_*',
739-
'drop *_ak5GenJets_*_*',
739+
'drop *_ak4GenJets_*_*',
740740
'drop *_ak7GenJets_*_*',
741741
'drop *_genCandidatesForMET_*_*',
742742
'drop *_genParticlesForMETAllVisible_*_*',

0 commit comments

Comments
 (0)