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

Adding UL16 PUID and fixing QGL values in nanoAOD #33925

Merged
merged 3 commits into from
Jun 3, 2021
Merged

Adding UL16 PUID and fixing QGL values in nanoAOD #33925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3063937
adding QGL fix and PUIDUL16
alefisico May 31, 2021
72b1bf6
adding QGL fix and PUIDUL16
alefisico May 31, 2021
8b0b1c2
including UL16 PUID in jmeNano
alefisico Jun 2, 2021
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
61 changes: 30 additions & 31 deletions PhysicsTools/NanoAOD/python/custom_jme_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,28 +74,28 @@
# "enabled" to true if you want to store the recojet collection.
#
config_recojets = [
{
{
"jet" : "ak4calo",
"enabled" : True,
"inputCollection" : "slimmedCaloJets", #Exist in MiniAOD
"genJetsCollection": "AK4GenJetsNoNu",
},
{
},
{
"jet" : "ak4pf",
"enabled" : False,
"inputCollection" : "",
"genJetsCollection": "AK4GenJetsNoNu",
"minPtFastjet" : 0.,
},
{
},
{
"jet" : "ak4pfpuppi",
"enabled" : True,
"inputCollection" : "",
"genJetsCollection": "AK4GenJetsNoNu",
"bTagDiscriminators": bTagDiscriminatorsForAK4,
"minPtFastjet" : 0.,
},
{
},
{
"jet" : "ak8pf",
"enabled" : False,
"inputCollection" : "",
Expand Down Expand Up @@ -210,7 +210,7 @@
#
#
# Reco Jets related functions
#
#
#
#******************************************
def AddJetID(proc, jetName="", jetSrc="", jetTableName="", jetSequenceName=""):
Expand All @@ -219,7 +219,7 @@ def AddJetID(proc, jetName="", jetSrc="", jetTableName="", jetSequenceName=""):
"""

isPUPPIJet = True if "Puppi" in jetName else False

looseJetId = "looseJetId{}".format(jetName)
setattr(proc, looseJetId, proc.looseJetId.clone(
src = jetSrc,
Expand All @@ -237,7 +237,7 @@ def AddJetID(proc, jetName="", jetSrc="", jetTableName="", jetSequenceName=""):
),
)
)

tightJetIdLepVeto = "tightJetIdLepVeto{}".format(jetName)
setattr(proc, tightJetIdLepVeto, proc.tightJetIdLepVeto.clone(
src = jetSrc,
Expand All @@ -255,10 +255,10 @@ def AddJetID(proc, jetName="", jetSrc="", jetTableName="", jetSequenceName=""):
modifier.toModify(getattr(proc, tightJetIdLepVeto).filterParams, version = "WINTER17{}".format("PUPPI" if isPUPPIJet else ""))
run2_nanoAOD_102Xv1.toModify(getattr(proc, tightJetId).filterParams, version = "SUMMER18{}".format("PUPPI" if isPUPPIJet else "") )
run2_nanoAOD_102Xv1.toModify(getattr(proc, tightJetIdLepVeto).filterParams, version = "SUMMER18{}".format("PUPPI" if isPUPPIJet else "") )

#
# Save variables as userInts in each jet
#
#
patJetWithUserData = "{}WithUserData".format(jetSrc)
getattr(proc, patJetWithUserData).userInts.tightId = cms.InputTag(tightJetId)
getattr(proc, patJetWithUserData).userInts.tightIdLepVeto = cms.InputTag(tightJetIdLepVeto)
Expand All @@ -275,7 +275,7 @@ def AddJetID(proc, jetName="", jetSrc="", jetTableName="", jetSequenceName=""):

getattr(proc,jetSequenceName).insert(getattr(proc,jetSequenceName).index(getattr(proc, jetSrc))+1, getattr(proc, tightJetId))
getattr(proc,jetSequenceName).insert(getattr(proc,jetSequenceName).index(getattr(proc, tightJetId))+1, getattr(proc, tightJetIdLepVeto))

setattr(proc,"_"+jetSequenceName+"_2016", getattr(proc,jetSequenceName).copy())
getattr(proc,"_"+jetSequenceName+"_2016").insert(getattr(proc, "_"+jetSequenceName+"_2016").index(getattr(proc, tightJetId)), getattr(proc, looseJetId))
for modifier in run2_miniAOD_80XLegacy, run2_nanoAOD_94X2016:
Expand Down Expand Up @@ -315,7 +315,7 @@ def AddPileUpJetIDVars(proc, jetName="", jetSrc="", jetTableName="", jetSequence

#
# Save variables as userFloats and userInts for each jet
#
#
patJetWithUserData = "{}WithUserData".format(jetSrc)
getattr(proc,patJetWithUserData).userFloats.puId_dR2Mean = cms.InputTag("{}:dR2Mean".format(puJetIDVar))
getattr(proc,patJetWithUserData).userFloats.puId_majW = cms.InputTag("{}:majW".format(puJetIDVar))
Expand Down Expand Up @@ -366,7 +366,7 @@ def AddQGLTaggerVars(proc, jetName="", jetSrc="", jetTableName="", jetSequenceNa

#
# Save variables as userFloats and userInts for each jet
#
#
getattr(proc,patJetWithUserData).userFloats.qgl_axis2 = cms.InputTag(QGLTagger+":axis2")
getattr(proc,patJetWithUserData).userFloats.qgl_ptD = cms.InputTag(QGLTagger+":ptD")
getattr(proc,patJetWithUserData).userInts.qgl_mult = cms.InputTag(QGLTagger+":mult")
Expand Down Expand Up @@ -473,7 +473,7 @@ def SavePatJets(proc, jetName, payload, patJetFinalColl, jetTablePrefix, jetTabl
jetCorrFactorsSource = [jetCorrFactors],
)
)

#
# Setup UserDataEmbedder
#
Expand All @@ -484,7 +484,7 @@ def SavePatJets(proc, jetName, payload, patJetFinalColl, jetTablePrefix, jetTabl
userInts = cms.PSet(),
)
)

#
# Filter jets with pt cut
#
Expand Down Expand Up @@ -563,7 +563,7 @@ def SavePatJets(proc, jetName, payload, patJetFinalColl, jetTablePrefix, jetTabl

jetTableSequenceMCName = "jet{}MCTablesSequence".format(jetName)
setattr(proc, jetTableSequenceMCName, cms.Sequence(getattr(proc,jetMCTable)))

if runOnMC:
proc.nanoSequenceMC += getattr(proc,jetSequenceName)
proc.nanoSequenceMC += getattr(proc,jetTableSequenceName)
Expand All @@ -581,7 +581,7 @@ def SavePatJets(proc, jetName, payload, patJetFinalColl, jetTablePrefix, jetTabl
proc = AddPileUpJetIDVars(proc, jetName=jetName, jetSrc=srcJets, jetTableName=jetTable, jetSequenceName=jetSequenceName)
if doQGL:
proc = AddQGLTaggerVars(proc,jetName=jetName, jetSrc=srcJets, jetTableName=jetTable, jetSequenceName=jetSequenceName, calculateQGLVars=True)

#
# Save b-tagging algorithm scores. Should only be done for jet collection with b-tagging
# calculated when reclustered or collection saved with b-tagging info in MiniAOD
Expand All @@ -596,15 +596,15 @@ def SavePatJets(proc, jetName, payload, patJetFinalColl, jetTablePrefix, jetTabl
def ReclusterAK4CHSJets(proc, recoJA, runOnMC):
"""
Recluster AK4 CHS jets and replace slimmedJets
that is used as default to save AK4 CHS jets
in NanoAODs.
that is used as default to save AK4 CHS jets
in NanoAODs.
"""
print("custom_jme_cff::ReclusterAK4CHSJets: Recluster AK4 PF CHS jets")

#
# Recluster AK4 CHS jets
#
cfg = {
cfg = {
"jet" : "ak4pfchs",
"inputCollection" : "",
"genJetsCollection": "AK4GenJetsNoNu",
Expand All @@ -615,11 +615,11 @@ def ReclusterAK4CHSJets(proc, recoJA, runOnMC):

jetName = recoJetInfo.jetUpper
patJetFinalColl = recoJetInfo.patJetFinalCollection

#
# Change the input jet source for jetCorrFactorsNano
# and updatedJets
#
#
proc.jetCorrFactorsNano.src=patJetFinalColl
proc.updatedJets.jetSource=patJetFinalColl

Expand Down Expand Up @@ -683,8 +683,7 @@ def ReclusterAK4CHSJets(proc, recoJA, runOnMC):
proc.updatedJetsWithUserData.userInts.puId80XfullId = cms.InputTag('pileupJetId80X:fullId')
proc.updatedJetsWithUserData.userFloats.puId80XDisc = cms.InputTag("pileupJetId80X:fullDiscriminant")

run2_jme_2016.toModify(proc.jetTable.variables, puIdDisc = Var("userFloat('puId80XDisc')",float,doc="Pilup ID discriminant with 80X (2016) training",precision=10))
run2_jme_2016.toModify(proc.jetTable.variables, puId = Var("userInt('puId80XfullId')",int,doc="Pileup ID flags with 80X (2016) training"))
run2_nanoAOD_94X2016.toModify(proc.jetTable.variables, puIdDisc = Var("userFloat('puId80XDisc')",float,doc="Pilup ID discriminant with 80X (2016) training",precision=10))

for modifier in run2_nanoAOD_94X2016, run2_nanoAOD_94XMiniAODv1, run2_nanoAOD_94XMiniAODv2, run2_nanoAOD_102Xv1:
modifier.toModify(proc.jetTable.variables, puId = Var("userInt('puId80XfullId')", int, doc="Pileup ID flags with 80X (2016) training"))
Expand All @@ -702,7 +701,7 @@ def ReclusterAK4CHSJets(proc, recoJA, runOnMC):
#
# Add variables for pileup jet ID studies.
#
proc = AddPileUpJetIDVars(proc,
proc = AddPileUpJetIDVars(proc,
jetName = "",
jetSrc = "updatedJets",
jetTableName = "jetTable",
Expand Down Expand Up @@ -859,7 +858,7 @@ def AddVariablesForAK8PuppiJets(proc):
#
#
# Gen Jets related functions
#
#
#
#******************************************
def AddNewGenJets(proc, genJetInfo):
Expand Down Expand Up @@ -933,8 +932,8 @@ def ReclusterAK4GenJets(proc, genJA):
#
# Recluster AK4 Gen jet
#
cfg = {
"jet" : "ak4gen",
cfg = {
"jet" : "ak4gen",
}
genJetInfo = genJA.addGenJetCollection(proc, **cfg)

Expand Down Expand Up @@ -1096,7 +1095,7 @@ def PrepJMECustomNanoAOD(process,runOnMC):
###########################################################################
if runOnMC:
process.genWeightsTable.keepAllPSWeights = True

return process

def PrepJMECustomNanoAOD_MC(process):
Expand Down
21 changes: 16 additions & 5 deletions PhysicsTools/NanoAOD/python/jets_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@
qgl = cms.InputTag('qgtagger:qgLikelihood'),
puId94XDisc = cms.InputTag('pileupJetId94X:fullDiscriminant'),
puId102XDisc = cms.InputTag('pileupJetId102X:fullDiscriminant'),
puId106XUL16Disc = cms.InputTag('pileupJetId106XUL16:fullDiscriminant'),
puId106XUL16APVDisc = cms.InputTag('pileupJetId106XUL16APV:fullDiscriminant'),
puId106XUL17Disc = cms.InputTag('pileupJetId106XUL17:fullDiscriminant'),
puId106XUL18Disc = cms.InputTag('pileupJetId106XUL18:fullDiscriminant'),
chFPV0EF = cms.InputTag("jercVars:chargedFromPV0EnergyFraction"),
Expand All @@ -160,6 +162,8 @@
tightIdLepVeto = cms.InputTag("tightJetIdLepVeto"),
vtxNtrk = cms.InputTag("bJetVars:vtxNtrk"),
leptonPdgId = cms.InputTag("bJetVars:leptonPdgId"),
puId106XUL16Id = cms.InputTag('pileupJetId106XUL16:fullId'),
puId106XUL16APVId = cms.InputTag('pileupJetId106XUL16APV:fullId'),
puId106XUL17Id = cms.InputTag('pileupJetId106XUL17:fullId'),
puId106XUL18Id = cms.InputTag('pileupJetId106XUL18:fullId'),
),
Expand Down Expand Up @@ -236,7 +240,7 @@
puIdDisc = Var("userFloat('puId106XUL18Disc')", float,doc="Pileup ID discriminant with 106X (2018) training",precision=10),
puId = Var("userInt('puId106XUL18Id')", int,doc="Pileup ID flags with 106X (2018) training"),
jetId = Var("userInt('tightId')*2+4*userInt('tightIdLepVeto')",int,doc="Jet ID flags bit1 is loose (always false in 2017 since it does not exist), bit2 is tight, bit3 is tightLepVeto"),
qgl = Var("userFloat('qgl')",float,doc="Quark vs Gluon likelihood discriminator",precision=10),
qgl = Var("?userFloat('qgl')>0?userFloat('qgl'):-1",float,doc="Quark vs Gluon likelihood discriminator",precision=10),
hfsigmaEtaEta = Var("userFloat('hfJetShowerShape:sigmaEtaEta')",float,doc="sigmaEtaEta for HF jets (noise discriminating variable)",precision=10),
hfsigmaPhiPhi = Var("userFloat('hfJetShowerShape:sigmaPhiPhi')",float,doc="sigmaPhiPhi for HF jets (noise discriminating variable)",precision=10),
hfcentralEtaStripSize = Var("userInt('hfJetShowerShape:centralEtaStripSize')", int, doc="eta size of the central tower strip in HF (noise discriminating variable) "),
Expand Down Expand Up @@ -267,10 +271,15 @@
modifier.toModify( jetTable.variables, jetId = Var("userInt('tightIdLepVeto')*4+userInt('tightId')*2+userInt('looseId')",int,doc="Jet ID flags bit1 is loose, bit2 is tight, bit3 is tightLepVeto"))
run2_nanoAOD_102Xv1.toModify( jetTable.variables, puIdDisc = Var("userFloat('puId102XDisc')",float,doc="Pileup ID discriminant with 102X (2018) training",precision=10) )
run2_nanoAOD_102Xv1.toModify( jetTable.variables, puId = Var("userInt('pileupJetId:fullId')",int,doc="Pileup ID flags for pre-UL trainings") )
run2_jme_2016.toModify( jetTable.variables, puIdDisc = Var("userFloat('pileupJetId:fullDiscriminant')",float,doc="Pileup ID discriminant with 80X (2016) training",precision=10))
run2_jme_2016.toModify( jetTable.variables, puId = Var("userInt('pileupJetId:fullId')",int,doc="Pileup ID flags for pre-UL trainings"))
(run2_jme_2016 & ~tracker_apv_vfp30_2016 ).toModify( jetTable.variables, puId = Var("userInt('puId106XUL16Id')",int,doc="Pileup ID flags with 106X (2016) training"))
(run2_jme_2016 & ~tracker_apv_vfp30_2016 ).toModify( jetTable.variables, puIdDisc = Var("userFloat('puId106XUL16Disc')",float,doc="Pileup ID discriminant with 106X (2016) training",precision=10))
(run2_jme_2016 & tracker_apv_vfp30_2016 ).toModify( jetTable.variables, puId = Var("userInt('puId106XUL16APVId')",int,doc="Pileup ID flags with 106X (2016APV) training"))
(run2_jme_2016 & tracker_apv_vfp30_2016 ).toModify( jetTable.variables, puIdDisc = Var("userFloat('puId106XUL16APVDisc')",float,doc="Pileup ID discriminant with 106X (2016APV) training",precision=10))
run2_jme_2017.toModify( jetTable.variables, puId = Var("userInt('puId106XUL17Id')", int,doc="Pileup ID flags with 106X (2017) training"))
run2_jme_2017.toModify( jetTable.variables, puIdDisc = Var("userFloat('puId106XUL17Disc')", float,doc="Pileup ID discriminant with 106X (2017) training",precision=10))
for modifier in run2_miniAOD_80XLegacy, run2_nanoAOD_94X2016:
modifier.toModify( jetTable.variables, puIdDisc = Var("userFloat('pileupJetId:fullDiscriminant')",float,doc="Pileup ID discriminant with 80X (2016) training",precision=10))
modifier.toModify( jetTable.variables, puId = Var("userInt('pileupJetId:fullId')",int,doc="Pileup ID flags for pre-UL trainings"))
for modifier in run2_nanoAOD_94XMiniAODv1, run2_nanoAOD_94XMiniAODv2:
modifier.toModify( jetTable.variables, puIdDisc = Var("userFloat('puId94XDisc')", float,doc="Pileup ID discriminant with 94X (2017) training",precision=10))
modifier.toModify( jetTable.variables, puId = Var("userInt('pileupJetId:fullId')",int,doc="Pileup ID flags for 2016/2017/2018 EOY trainings"))
Expand Down Expand Up @@ -701,14 +710,16 @@
qgtagger=QGTagger.clone(srcJets="updatedJets",srcVertexCollection="offlineSlimmedPrimaryVertices")


from RecoJets.JetProducers.PileupJetID_cfi import pileupJetId, _chsalgos_94x, _chsalgos_102x, _chsalgos_106X_UL17, _chsalgos_106X_UL18
from RecoJets.JetProducers.PileupJetID_cfi import pileupJetId, _chsalgos_94x, _chsalgos_102x, _chsalgos_106X_UL16, _chsalgos_106X_UL16APV, _chsalgos_106X_UL17, _chsalgos_106X_UL18
pileupJetId94X=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_94x),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")
pileupJetId102X=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_102x),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")
pileupJetId106XUL16=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_106X_UL16),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")
pileupJetId106XUL16APV=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_106X_UL16APV),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")
pileupJetId106XUL17=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_106X_UL17),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")
pileupJetId106XUL18=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_106X_UL18),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")

#before cross linking
jetSequence = cms.Sequence(jetCorrFactorsNano+updatedJets+tightJetId+tightJetIdLepVeto+bJetVars+qgtagger+jercVars+pileupJetId94X+pileupJetId102X+pileupJetId106XUL17+pileupJetId106XUL18+updatedJetsWithUserData+jetCorrFactorsAK8+updatedJetsAK8+tightJetIdAK8+tightJetIdLepVetoAK8+updatedJetsAK8WithUserData+chsForSATkJets+softActivityJets+softActivityJets2+softActivityJets5+softActivityJets10+finalJets+finalJetsAK8)
jetSequence = cms.Sequence(jetCorrFactorsNano+updatedJets+tightJetId+tightJetIdLepVeto+bJetVars+qgtagger+jercVars+pileupJetId94X+pileupJetId102X+pileupJetId106XUL16+pileupJetId106XUL16APV+pileupJetId106XUL17+pileupJetId106XUL18+updatedJetsWithUserData+jetCorrFactorsAK8+updatedJetsAK8+tightJetIdAK8+tightJetIdLepVetoAK8+updatedJetsAK8WithUserData+chsForSATkJets+softActivityJets+softActivityJets2+softActivityJets5+softActivityJets10+finalJets+finalJetsAK8)


_jetSequence_2016 = jetSequence.copy()
Expand Down