Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up re-running of reco modules #5

Merged
merged 5 commits into from
Aug 31, 2015
Merged

Clean up re-running of reco modules #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f78f40
Don't run ak4PFJets (fix RecoJets/JetProducers/python/ak4PFJetsPuppi_…
gpetruc Aug 28, 2015
e414f46
Don't re-run pfMet (miniAOD_tools)
gpetruc Aug 28, 2015
40f4d30
Don't rerun ak8PFJetsCHSSoftDrop (PhysicsTools/PatAlgos/python/slimmi…
gpetruc Aug 28, 2015
c84b62d
Don't load particleFlowPtrs (PhysicsTools/PatAlgos/python/recoLayer0/…
gpetruc Aug 28, 2015
a0cae3f
Don't load particleFlowPtrs (JetMETCorrections/Type1MET/python/correc…
gpetruc Aug 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions JetMETCorrections/Type1MET/python/correctionTermsPfMetType1Type2_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
src = cms.InputTag("ak4PFJets")
)
# this one is needed only if the input file doesn't have it
# solved automatically with unscheduled execution
from RecoParticleFlow.PFProducer.pfLinker_cff import particleFlowPtrs
#from RecoParticleFlow.PFProducer.pfLinker_cff import particleFlowPtrs
# particleFlowPtrs = cms.EDProducer("PFCandidateFwdPtrProducer",
# src = cms.InputTag("particleFlow")
# )
Expand Down Expand Up @@ -67,7 +66,7 @@
##____________________________________________________________________________||
correctionTermsPfMetType1Type2 = cms.Sequence(
pfJetsPtrForMetCorr +
particleFlowPtrs +
#particleFlowPtrs +
pfCandsNotInJetsPtrForMetCorr +
pfCandsNotInJetsForMetCorr +
pfCandMETcorr +
Expand Down
2 changes: 0 additions & 2 deletions PhysicsTools/PatAlgos/python/recoLayer0/pfParticleSelectionForIso_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import FWCore.ParameterSet.Config as cms

from CommonTools.ParticleFlow.PFBRECO_cff import particleFlowPtrs
from CommonTools.ParticleFlow.PFBRECO_cff import pfPileUpIsoPFBRECO, pfNoPileUpIsoPFBRECO, pfNoPileUpIsoPFBRECOSequence
from CommonTools.ParticleFlow.PFBRECO_cff import pfPileUpPFBRECO, pfNoPileUpPFBRECO, pfNoPileUpPFBRECOSequence
from CommonTools.ParticleFlow.PFBRECO_cff import pfAllNeutralHadronsPFBRECO, pfAllChargedHadronsPFBRECO, pfAllPhotonsPFBRECO, pfAllChargedParticlesPFBRECO, pfPileUpAllChargedParticlesPFBRECO, pfAllNeutralHadronsAndPhotonsPFBRECO, pfSortByTypePFBRECOSequence
from CommonTools.ParticleFlow.PFBRECO_cff import pfParticleSelectionPFBRECOSequence

pfParticleSelectionForIsoSequence = cms.Sequence(
particleFlowPtrs +
pfParticleSelectionPFBRECOSequence
)
2 changes: 1 addition & 1 deletion PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def applySubstructure( process ) :
## AK8 groomed masses
from RecoJets.Configuration.RecoPFJets_cff import ak8PFJetsCHSPruned, ak8PFJetsCHSSoftDrop, ak8PFJetsCHSFiltered, ak8PFJetsCHSTrimmed
process.ak8PFJetsCHSPruned = ak8PFJetsCHSPruned.clone()
process.ak8PFJetsCHSSoftDrop = ak8PFJetsCHSSoftDrop.clone()
#process.ak8PFJetsCHSSoftDrop = ak8PFJetsCHSSoftDrop.clone() # already in AOD
process.ak8PFJetsCHSTrimmed = ak8PFJetsCHSTrimmed.clone()
process.ak8PFJetsCHSFiltered = ak8PFJetsCHSFiltered.clone()
process.load("RecoJets.JetProducers.ak8PFJetsCHS_groomingValueMaps_cfi")
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,11 @@ def miniAOD_customizeCommon(process):
process.slimmedJetsPuppi.packedPFCandidates = cms.InputTag("packedPFCandidates")

## puppi met
process.load('RecoMET.METProducers.PFMET_cfi')
process.puppiForMET = cms.EDProducer("CandViewMerger",
src = cms.VInputTag( "pfLeptonsPUPPET", "puppiNoLep")
)
process.pfMetPuppi = process.pfMet.clone()
import RecoMET.METProducers.PFMET_cfi
process.pfMetPuppi = RecoMET.METProducers.PFMET_cfi.pfMet.clone()
process.pfMetPuppi.src = cms.InputTag("puppiForMET")
process.pfMetPuppi.alias = cms.string('pfMetPuppi')
## type1 correction, from puppi jets
Expand Down
4 changes: 2 additions & 2 deletions RecoJets/JetProducers/python/ak4PFJetsPuppi_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from RecoJets.JetProducers.PFJetParameters_cfi import *
from RecoJets.JetProducers.AnomalousCellParameters_cfi import *
from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJets
import RecoJets.JetProducers.ak4PFJets_cfi

ak4PFJetsPuppi = ak4PFJets.clone(
ak4PFJetsPuppi = RecoJets.JetProducers.ak4PFJets_cfi.ak4PFJets.clone(
src = cms.InputTag("puppi")
)