From e21943547465d7e9b2a363c8b656c6837e71329f Mon Sep 17 00:00:00 2001 From: Andreas Hinzmann Date: Wed, 2 Sep 2015 10:38:11 +0200 Subject: [PATCH 1/4] re-enable algorithmic definition in MiniAOD --- PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py | 2 +- PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py | 2 +- PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py | 2 +- PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py b/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py index bcbe821370f89..6fd5ef99da3a2 100644 --- a/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py +++ b/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py @@ -4,7 +4,7 @@ jets = cms.InputTag("ak4PFJets"), bHadrons = cms.InputTag("selectedHadronsAndPartons","bHadrons"), cHadrons = cms.InputTag("selectedHadronsAndPartons","cHadrons"), - partons = cms.InputTag("selectedHadronsAndPartons","physicsPartons"), + partons = cms.InputTag("selectedHadronsAndPartons","algorithmicPartons"), leptons = cms.InputTag("selectedHadronsAndPartons","leptons"), jetAlgorithm = cms.string("AntiKt"), rParam = cms.double(0.4), diff --git a/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py b/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py index 5bec65672a08e..c6ded52c30d3b 100644 --- a/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py +++ b/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py @@ -4,7 +4,7 @@ jets = cms.InputTag("ak5PFJets"), bHadrons = cms.InputTag("selectedHadronsAndPartons","bHadrons"), cHadrons = cms.InputTag("selectedHadronsAndPartons","cHadrons"), - partons = cms.InputTag("selectedHadronsAndPartons","physicsPartons"), + partons = cms.InputTag("selectedHadronsAndPartons","algorithmicPartons"), leptons = cms.InputTag("selectedHadronsAndPartons","leptons"), jetAlgorithm = cms.string("AntiKt"), rParam = cms.double(0.5), diff --git a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py index 6b798b45afaab..e71c53e3ae178 100644 --- a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py +++ b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py @@ -26,7 +26,7 @@ jets = cms.InputTag("ak4PFJetsCHS"), bHadrons = cms.InputTag("patJetPartons","bHadrons"), cHadrons = cms.InputTag("patJetPartons","cHadrons"), - partons = cms.InputTag("patJetPartons","physicsPartons"), + partons = cms.InputTag("patJetPartons","algorithmicPartons"), leptons = cms.InputTag("patJetPartons","leptons"), jetAlgorithm = cms.string("AntiKt"), rParam = cms.double(0.4), diff --git a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py index dbfe85365d022..8141442b5bd71 100644 --- a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py +++ b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py @@ -7,7 +7,7 @@ src = cms.InputTag("ak4PFJetsCHS"), # RECO objects to match matched = cms.InputTag("genParticles"), # mc-truth particle collection mcPdgId = cms.vint32(1, 2, 3, 4, 5, 21), # one or more PDG ID (quarks except top; gluons) - mcStatus = cms.vint32(3), # PYTHIA status code (3 = hard scattering) + mcStatus = cms.vint32(3,23), # PYTHIA6/Herwig++ status code (3 = hard scattering), 23 in Pythia8 checkCharge = cms.bool(False), # False = any value of the charge of MC and RECO is ok maxDeltaR = cms.double(0.4), # Minimum deltaR for the match maxDPtRel = cms.double(3.0), # Minimum deltaPt/Pt for the match From 0c938d4cdf041169bac48cbdeba75e01c8100799 Mon Sep 17 00:00:00 2001 From: Andreas Hinzmann Date: Wed, 2 Sep 2015 11:22:24 +0200 Subject: [PATCH 2/4] fix algorithmic definition again --- PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py | 1 - 1 file changed, 1 deletion(-) diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index f1b7dc648224f..061c96a04ac24 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -278,7 +278,6 @@ def miniAOD_customizeMC(process): process.photonMatch.src = cms.InputTag("reducedEgamma","reducedGedPhotons") process.tauMatch.matched = "prunedGenParticles" process.tauGenJets.GenParticles = "prunedGenParticles" - process.patJetPartons.particles = "prunedGenParticles" process.patJetPartonMatch.matched = "prunedGenParticles" process.patJetPartonMatch.mcStatus = [ 3, 23 ] process.patJetGenJetMatch.matched = "slimmedGenJets" From 2063ba4f05e46d8b6426fcadcfd26e725bae4176 Mon Sep 17 00:00:00 2001 From: Andreas Hinzmann Date: Wed, 2 Sep 2015 11:35:52 +0200 Subject: [PATCH 3/4] revert last commit --- PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py | 1 + 1 file changed, 1 insertion(+) diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index 061c96a04ac24..f1b7dc648224f 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -278,6 +278,7 @@ def miniAOD_customizeMC(process): process.photonMatch.src = cms.InputTag("reducedEgamma","reducedGedPhotons") process.tauMatch.matched = "prunedGenParticles" process.tauGenJets.GenParticles = "prunedGenParticles" + process.patJetPartons.particles = "prunedGenParticles" process.patJetPartonMatch.matched = "prunedGenParticles" process.patJetPartonMatch.mcStatus = [ 3, 23 ] process.patJetGenJetMatch.matched = "slimmedGenJets" From b5278036354c8957f49e233fcacd0c96b58b0d13 Mon Sep 17 00:00:00 2001 From: Andreas Hinzmann Date: Fri, 4 Sep 2015 11:29:13 +0200 Subject: [PATCH 4/4] comment from Dinko --- PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py | 2 +- PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py b/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py index 6fd5ef99da3a2..f09c9a7017941 100644 --- a/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py +++ b/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py @@ -9,5 +9,5 @@ jetAlgorithm = cms.string("AntiKt"), rParam = cms.double(0.4), ghostRescaling = cms.double(1e-18), - hadronFlavourHasPriority = cms.bool(True) + hadronFlavourHasPriority = cms.bool(False) ) diff --git a/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py b/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py index c6ded52c30d3b..fe3b02d08bf1e 100644 --- a/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py +++ b/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py @@ -9,5 +9,5 @@ jetAlgorithm = cms.string("AntiKt"), rParam = cms.double(0.5), ghostRescaling = cms.double(1e-18), - hadronFlavourHasPriority = cms.bool(True) + hadronFlavourHasPriority = cms.bool(False) )