Merge pull request #11077 from ahinzmann/flavorfollowup74

Followup on flavor definition in MiniAOD 74
cms-sw · Sep 7, 2015 · c2fecc3 · c2fecc3
2 parents 33a4cfc + 75c8292
commit c2fecc3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py b/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py
@@ -4,10 +4,10 @@
     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),
     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
@@ -4,10 +4,10 @@
     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),
     ghostRescaling           = cms.double(1e-18),
-    hadronFlavourHasPriority = cms.bool(True)
+    hadronFlavourHasPriority = cms.bool(False)
 )
diff --git 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
@@ -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