Merge pull request #46627 from pasenov/addTrackGenJet3

trackGenJetAK4 added

Author: cmsbuild

PhysicsTools/NanoAOD/python/jetMC_cff.py

@@ -5,6 +5,7 @@
 from PhysicsTools.NanoAOD.simplePATJetFlatTableProducer_cfi import simplePATJetFlatTableProducer
 from PhysicsTools.NanoAOD.jetsAK8_cff import fatJetTable as _fatJetTable
 from PhysicsTools.NanoAOD.jetsAK8_cff import subJetTable as _subJetTable
+from RecoJets.JetProducers.ak4GenJets_cfi import ak4GenJets
 
 jetMCTable = simplePATJetFlatTableProducer.clone(
     src = cms.InputTag("linkedObjects","jets"),
@@ -23,7 +24,7 @@
     name = cms.string("GenJet"),
     doc  = cms.string("slimmedGenJets, i.e. ak4 Jets made with visible genparticles"),
     variables = cms.PSet(P4Vars,
-	#anything else?
+    #anything else?
     )
 )
 
@@ -60,7 +61,7 @@
     name = cms.string("GenJetAK8"),
     doc  = cms.string("slimmedGenJetsAK8, i.e. ak8 Jets made with visible genparticles"),
     variables = cms.PSet(P4Vars,
-	#anything else?
+    #anything else?
     )
 )
 
@@ -100,7 +101,7 @@
     name = cms.string("SubGenJetAK8"),
     doc  = cms.string("slimmedGenJetsAK8SoftDropSubJets, i.e. subjets of ak8 Jets made with visible genparticles"),
     variables = cms.PSet(P4Vars,
-	#anything else?
+    #anything else?
     )
 )
 subjetMCTable = simplePATJetFlatTableProducer.clone(
@@ -116,7 +117,26 @@
     )
 )
 
+genParticlesForJetsCharged = cms.EDFilter("CandPtrSelector",
+    src = cms.InputTag("prunedGenParticles"),  # or "packedGenParticles" if available
+    cut = cms.string("charge != 0 && pt > 0.3 && status == 1 && abs(pdgId) != 12 && abs(pdgId) != 14 && abs(pdgId) != 16")
+)
+
+ak4GenJetsChargedOnly = ak4GenJets.clone(src = cms.InputTag("genParticlesForJetsCharged"), rParam = cms.double(0.4), jetAlgorithm=cms.string("AntiKt"), doAreaFastjet = False, jetPtMin=1)
+
+
+trackGenJetAK4Table = genJetTable.clone(
+    src = cms.InputTag("ak4GenJetsChargedOnly"),
+    cut = cms.string("pt > 1"),
+    name = cms.string("TrackGenJetAK4"),
+    doc = cms.string("AK4 GenJets made with charged particles only"),
+    variables = cms.PSet(P3Vars)
+)
+
+trackGenJetAK4Table.variables.pt.precision = 10
+trackGenJetAK4Table.variables.eta.precision = 8
+trackGenJetAK4Table.variables.phi.precision = 8
 
-jetMCTaskak4 = cms.Task(jetMCTable,genJetTable,patJetPartonsNano,genJetFlavourTable)
+jetMCTaskak4 = cms.Task(jetMCTable,genJetTable,patJetPartonsNano,genJetFlavourTable,genParticlesForJetsCharged,ak4GenJetsChargedOnly,trackGenJetAK4Table)
 jetMCTaskak8 = cms.Task(genJetAK8Table,genJetAK8FlavourAssociation,genJetAK8FlavourTable,fatJetMCTable,genSubJetAK8Table,subjetMCTable)
 jetMCTask = jetMCTaskak4.copyAndAdd(jetMCTaskak8)

PhysicsTools/NanoAOD/python/nanoDQM_cfi.py

@@ -373,6 +373,20 @@
                 Plot1D('pt', 'pt', 20, 0, 200, 'pt'),
             )
         ),
+        TrackGenJetAK4 = cms.PSet(
+            sels = cms.PSet(),
+            plots = cms.VPSet(
+                Count1D('_size', 25, -0.5, 24.5, 'trackGenJetAK4, i.e. ak4 Jets made only with charged particles'),
+                Plot1D('eta', 'eta', 20, -7, 7, 'eta'),
+                Plot1D('hadronFlavour', 'hadronFlavour', 6, -0.5, 5.5, 'flavour from hadron ghost clustering'),
+                Plot1D('mass', 'mass', 20, 0, 200, 'mass'),
+                Plot1D('nBHadrons', 'nBHadrons', 4, -0.5, 3.5, 'number of b-hadrons'),
+                Plot1D('nCHadrons', 'nCHadrons', 4, -0.5, 3.5, 'number of c-hadrons'),
+                Plot1D('partonFlavour', 'partonFlavour', 40, -9.5, 30.5, 'flavour from parton matching'),
+                Plot1D('phi', 'phi', 20, -3.14159, 3.14159, 'phi'),
+                Plot1D('pt', 'pt', 20, 0, 200, 'pt'),
+            )
+        ),
         GenMET = cms.PSet(
             sels = cms.PSet(),
             plots = cms.VPSet(
@@ -500,6 +514,10 @@
                 Plot1D('neHEF', 'neHEF', 20, 0, 1, 'neutral Hadron Energy Fraction'),
                 Plot1D('partonFlavour', 'partonFlavour', 40, -9.5, 30.5, 'flavour from parton matching'),
                 Plot1D('phi', 'phi', 20, -3.14159, 3.14159, 'phi'),
+                Plot1D('pnScore_heavy', 'pnScore_heavy', 40, -1, 1, 'PNet muon ID score for lepton from B or D hadrons'),
+                Plot1D('pnScore_light', 'pnScore_light', 40, -1, 1, 'PNet muon ID score for lepton from hadrons w/o b or c quarks OR w/o generator matching'),
+                Plot1D('pnScore_prompt', 'pnScore_prompt', 40, -1, 1, 'PNet muon ID score for lepton from W/Z/H bosons'),
+                Plot1D('pnScore_tau', 'pnScore_tau', 40, -1, 1, 'PNet muon ID score for decay of tau to light leptons (mu)'),
                 Plot1D('pt', 'pt', 20, 0, 400, 'pt'),
                 Plot1D('puId', 'puId', 8, -0.5, 7.5, 'Pilup ID flags'),
                 Plot1D('puIdDisc', 'puIdDisc', 20, -1, 1, 'Pilup ID discriminant with 102X (2018) training'),
@@ -622,10 +640,6 @@
                 Plot1D('pfRelIso03_chg', 'pfRelIso03_chg', 20, 0, 2, 'PF relative isolation dR=0.3, charged component'),
                 Plot1D('pfRelIso04_all', 'pfRelIso04_all', 20, 0, 2, 'PF relative isolation dR=0.4, total (deltaBeta corrections)'),
                 Plot1D('phi', 'phi', 20, -3.14159, 3.14159, 'phi'),
-                Plot1D('pnScore_heavy', 'pnScore_heavy', 40, -1, 1, 'PNet muon ID score for lepton from B or D hadrons'),
-                Plot1D('pnScore_light', 'pnScore_light', 40, -1, 1, 'PNet muon ID score for lepton from hadrons w/o b or c quarks OR w/o generator matching'),
-                Plot1D('pnScore_prompt', 'pnScore_prompt', 40, -1, 1, 'PNet muon ID score for lepton from W/Z/H bosons'),
-                Plot1D('pnScore_tau', 'pnScore_tau', 40, -1, 1, 'PNet muon ID score for decay of tau to light leptons (mu)'),
                 Plot1D('pt', 'pt', 20, 0, 200, 'pt'),
                 Plot1D('ptErr', 'ptErr', 20, 0, 20, 'ptError of the muon track'),
                 Plot1D('segmentComp', 'segmentComp', 20, 0, 1, 'muon segment compatibility'),
@@ -1044,3 +1058,4 @@
     )
 )
 
+

PhysicsTools/NanoAOD/python/nanogenDQM_cff.py

@@ -10,6 +10,7 @@
         GenIsolatedPhoton = nanoDQM.vplots.GenIsolatedPhoton,
         GenJet = nanoDQM.vplots.GenJet,
         GenJetAK8 = nanoDQM.vplots.GenJetAK8,
+        TrackGenJetAK4 = nanoDQM.vplots.TrackGenJetAK4,
         GenMET = nanoDQM.vplots.GenMET,
         GenPart = nanoDQM.vplots.GenPart, 
         GenVtx = nanoDQM.vplots.GenVtx,
@@ -31,3 +32,4 @@
 )
 
 nanogenHarvest = cms.Sequence( nanoDQMQTester )
+

PhysicsTools/NanoAOD/python/nanogen_cff.py

@@ -8,6 +8,7 @@
 from PhysicsTools.NanoAOD.genVertex_cff import *
 from PhysicsTools.NanoAOD.common_cff import Var,CandVars
 from PhysicsTools.NanoAOD.simpleSingletonCandidateFlatTableProducer_cfi import simpleSingletonCandidateFlatTableProducer
+from RecoJets.JetProducers.ak4GenJets_cfi import ak4GenJets
 
 nanoMetadata = cms.EDProducer("UniqueStringProducer",
     strings = cms.PSet(
@@ -24,6 +25,9 @@
     patJetPartonsNano+
     genJetFlavourAssociation+
     genJetFlavourTable+
+    genParticlesForJetsCharged+
+    ak4GenJetsChargedOnly+
+    trackGenJetAK4Table+
     genSubJetAK8Table+
     genJetAK8Table+
     genJetAK8FlavourAssociation+
@@ -115,6 +119,10 @@ def customizeNanoGEN(process):
     process.ak8GenJetsNoNuConstituents =  process.ak8GenJetsConstituents.clone(src='ak8GenJetsNoNu')
     process.ak8GenJetsNoNuSoftDrop = process.ak8GenJetsSoftDrop.clone(src=cms.InputTag('ak8GenJetsNoNuConstituents', 'constituents'))
     process.genSubJetAK8Table.src = "ak8GenJetsNoNuSoftDrop"
+    process.genParticlesForJetsCharged = cms.EDFilter("CandPtrSelector", src = cms.InputTag("genParticles"), cut = cms.string("charge != 0 && pt > 0.3 && status == 1 && abs(pdgId) != 12 && abs(pdgId) != 14 && abs(pdgId) != 16"))
+    process.ak4GenJetsChargedOnly = ak4GenJets.clone(src = cms.InputTag("genParticlesForJetsCharged"), rParam = cms.double(0.4), jetAlgorithm=cms.string("AntiKt"), doAreaFastjet = False, jetPtMin=1)
+    process.nanogenSequence.insert(0, process.ak4GenJetsChargedOnly)
+    process.nanogenSequence.insert(0, process.genParticlesForJetsCharged)
     process.nanogenSequence.insert(0, process.ak8GenJetsNoNuSoftDrop)
     process.nanogenSequence.insert(0, process.ak8GenJetsNoNuConstituents)
     # In case customizeNanoGENFromMini has already been called
@@ -128,14 +136,14 @@ def customizeNanoGEN(process):
 def pruneGenParticlesNano(process):
     process.finalGenParticles.src = process.genParticleTable.src.getModuleLabel()
     process.genParticleTable.src = "finalGenParticles"
-    process.nanogenSequence.insert(0, process.finalGenParticles)
+    process.nanogenSequence.insert(1, process.finalGenParticles)
     return process
 
 # Prune gen particles with conditions applied in usual MiniAOD
 def pruneGenParticlesMini(process):
-    if process.nanogenSequence.contains(process.mergedGenParticles):
-        raise ValueError("Applying the MiniAOD genParticle pruner to MiniAOD is redunant. " \
-            "Use a different customization.")
+#    if process.nanogenSequence.contains(process.mergedGenParticles):
+#        raise ValueError("Applying the MiniAOD genParticle pruner to MiniAOD is redunant. " \
+#            "Use a different customization.")
     from PhysicsTools.PatAlgos.slimming.prunedGenParticles_cfi import prunedGenParticles
     process.prunedGenParticles = prunedGenParticles.clone()
     process.prunedGenParticles.src = "genParticles"