Dinkos comments

cms-sw · Aug 13, 2015 · 0927982 · 0927982
1 parent 8966b75
commit 0927982
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py b/PhysicsTools/JetMCAlgos/python/AK4PFJetsMCFlavourInfos_cfi.py
@@ -4,7 +4,8 @@
     jets                     = cms.InputTag("ak4PFJets"),
     bHadrons                 = cms.InputTag("selectedHadronsAndPartons","bHadrons"),
     cHadrons                 = cms.InputTag("selectedHadronsAndPartons","cHadrons"),
-    partons                  = cms.InputTag("selectedHadronsAndPartons","partons"),
+    partons                  = cms.InputTag("selectedHadronsAndPartons","physicsPartons"),
+    leptons                  = cms.InputTag("selectedHadronsAndPartons","leptons"),
     jetAlgorithm             = cms.string("AntiKt"),
     rParam                   = cms.double(0.4),
     ghostRescaling           = cms.double(1e-18),

diff --git a/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py b/PhysicsTools/JetMCAlgos/python/AK5PFJetsMCFlavourInfos_cfi.py
@@ -4,7 +4,8 @@
     jets                     = cms.InputTag("ak5PFJets"),
     bHadrons                 = cms.InputTag("selectedHadronsAndPartons","bHadrons"),
     cHadrons                 = cms.InputTag("selectedHadronsAndPartons","cHadrons"),
-    partons                  = cms.InputTag("selectedHadronsAndPartons","partons"),
+    partons                  = cms.InputTag("selectedHadronsAndPartons","physicsPartons"),
+    leptons                  = cms.InputTag("selectedHadronsAndPartons","leptons"),
     jetAlgorithm             = cms.string("AntiKt"),
     rParam                   = cms.double(0.5),
     ghostRescaling           = cms.double(1e-18),

diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py
@@ -75,7 +75,7 @@
     # jet flavour idetification configurables
     getJetMCFlavour    = cms.bool(True),
     useLegacyJetMCFlavour = cms.bool(False),
-    addJetFlavourInfo  = cms.bool(False),
+    addJetFlavourInfo  = cms.bool(True),
     JetPartonMapSource = cms.InputTag("patJetFlavourAssociationLegacy"),
     JetFlavourInfoSource = cms.InputTag("patJetFlavourAssociation"),
     # efficiencies

diff --git a/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py b/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py
@@ -17,7 +17,7 @@ def applySubstructure( process ) :
     from PhysicsTools.PatAlgos.producersLayer1.jetProducer_cfi import patJets as patJetsDefault
 
     #add AK8
-    addJetCollection(process, labelName = '', postfix = 'AK8',
+    addJetCollection(process, labelName = 'AK8',
                      jetSource = cms.InputTag('ak8PFJetsCHS'),
                      algo= 'AK', rParam = 0.8,
                      jetCorrections = ('AK8PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'None'),

diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
@@ -282,18 +282,14 @@ def miniAOD_customizeMC(process):
     process.patJetPartonMatch.matched = "prunedGenParticles"
     process.patJetPartonMatch.mcStatus = [ 3, 23 ]
     process.patJetGenJetMatch.matched = "slimmedGenJets"
-    process.patJetPartonsAK8.particles = "prunedGenParticles"
     process.patJetGenJetMatchAK8.matched =  "slimmedGenJetsAK8"
     process.patMuons.embedGenMatch = False
     process.patElectrons.embedGenMatch = False
     process.patPhotons.embedGenMatch = False
     process.patTaus.embedGenMatch = False
     process.patJets.embedGenPartonMatch = False
-    process.patJets.addJetFlavourInfo = True
-    process.patJetsAK8.addJetFlavourInfo = True
     #also jet flavour must be switched
     process.patJetFlavourAssociation.rParam = 0.4
-    process.patJetFlavourAssociationAK8.rParam = 0.8
 
 def miniAOD_customizeOutput(out):
     out.dropMetaData = cms.untracked.string('ALL')