Skip to content

Commit e39ee00

Browse files
alefisicoalefisico
committed
Merge branch 'PUPPIMETwithPUPPIV15' of https://github.com/alefisico/cmssw into from-CMSSW_11_2_X_2020-11-01-2300
2 parents 2383795 + 0d7e2c6 commit e39ee00

File tree

3 files changed

+130
-95
lines changed

3 files changed

+130
-95
lines changed

‎PhysicsTools/NanoAOD/python/jets_cff.py‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJets
1717

1818
chsForSATkJets = cms.EDFilter("CandPtrSelector", src = cms.InputTag("packedPFCandidates"), cut = cms.string('charge()!=0 && pvAssociationQuality()>=5 && vertexRef().key()==0'))
19-
softActivityJets = ak4PFJets.clone(src = 'chsForSATkJets', doAreaFastjet = False, jetPtMin=1)
19+
softActivityJets = ak4PFJets.clone(src = 'chsForSATkJets', doAreaFastjet = False, jetPtMin=1)
2020
softActivityJets10 = cms.EDFilter("CandPtrSelector", src = cms.InputTag("softActivityJets"), cut = cms.string('pt>10'))
2121
softActivityJets5 = cms.EDFilter("CandPtrSelector", src = cms.InputTag("softActivityJets"), cut = cms.string('pt>5'))
2222
softActivityJets2 = cms.EDFilter("CandPtrSelector", src = cms.InputTag("softActivityJets"), cut = cms.string('pt>2'))
@@ -128,7 +128,7 @@
128128
)
129129

130130
jercVars = cms.EDProducer("BetaStarPackedCandidateVarProducer",
131-
srcJet = cms.InputTag("updatedJets"),
131+
srcJet = cms.InputTag("updatedJets"),
132132
srcPF = cms.InputTag("packedPFCandidates"),
133133
maxDR = cms.double(0.4)
134134
)
@@ -154,16 +154,18 @@
154154
qgl = cms.InputTag('qgtagger:qgLikelihood'),
155155
puId94XDisc = cms.InputTag('pileupJetId94X:fullDiscriminant'),
156156
puId102XDisc = cms.InputTag('pileupJetId102X:fullDiscriminant'),
157+
puId106XUL17Disc = cms.InputTag('pileupJetId106XUL17:fullDiscriminant'),
157158
chFPV0EF = cms.InputTag("jercVars:chargedFromPV0EnergyFraction"),
158159
chFPV1EF = cms.InputTag("jercVars:chargedFromPV1EnergyFraction"),
159160
chFPV2EF = cms.InputTag("jercVars:chargedFromPV2EnergyFraction"),
160-
chFPV3EF = cms.InputTag("jercVars:chargedFromPV3EnergyFraction"),
161+
chFPV3EF = cms.InputTag("jercVars:chargedFromPV3EnergyFraction"),
161162
),
162163
userInts = cms.PSet(
163164
tightId = cms.InputTag("tightJetId"),
164165
tightIdLepVeto = cms.InputTag("tightJetIdLepVeto"),
165166
vtxNtrk = cms.InputTag("bJetVars:vtxNtrk"),
166167
leptonPdgId = cms.InputTag("bJetVars:leptonPdgId"),
168+
puId106XUL17Id = cms.InputTag('pileupJetId106XUL17:fullId'),
167169
),
168170
)
169171
for modifier in run2_miniAOD_80XLegacy, run2_nanoAOD_94X2016:
@@ -235,8 +237,8 @@
235237
btagDeepFlavCvL = Var("?(bDiscriminator('pfDeepFlavourJetTags:probc')+bDiscriminator('pfDeepFlavourJetTags:probuds')+bDiscriminator('pfDeepFlavourJetTags:probg'))>0?bDiscriminator('pfDeepFlavourJetTags:probc')/(bDiscriminator('pfDeepFlavourJetTags:probc')+bDiscriminator('pfDeepFlavourJetTags:probuds')+bDiscriminator('pfDeepFlavourJetTags:probg')):-1",float,doc="DeepJet c vs uds+g discriminator",precision=10),
236238
btagDeepFlavCvB = Var("?(bDiscriminator('pfDeepFlavourJetTags:probc')+bDiscriminator('pfDeepFlavourJetTags:probb')+bDiscriminator('pfDeepFlavourJetTags:probbb')+bDiscriminator('pfDeepFlavourJetTags:problepb'))>0?bDiscriminator('pfDeepFlavourJetTags:probc')/(bDiscriminator('pfDeepFlavourJetTags:probc')+bDiscriminator('pfDeepFlavourJetTags:probb')+bDiscriminator('pfDeepFlavourJetTags:probbb')+bDiscriminator('pfDeepFlavourJetTags:problepb')):-1",float,doc="DeepJet c vs b+bb+lepb discriminator",precision=10),
237239
btagDeepFlavQG = Var("?(bDiscriminator('pfDeepFlavourJetTags:probg')+bDiscriminator('pfDeepFlavourJetTags:probuds'))>0?bDiscriminator('pfDeepFlavourJetTags:probg')/(bDiscriminator('pfDeepFlavourJetTags:probg')+bDiscriminator('pfDeepFlavourJetTags:probuds')):-1",float,doc="DeepJet g vs uds discriminator",precision=10),
238-
puIdDisc = Var("userFloat('puId102XDisc')",float,doc="Pilup ID discriminant with 102X (2018) training",precision=10),
239-
puId = Var("userInt('pileupJetId:fullId')",int,doc="Pilup ID flags with 80X (2016) training"),
240+
puIdDisc = Var("userFloat('puId102XDisc')",float,doc="Pileup ID discriminant with 102X (2018) training",precision=10),
241+
puId = Var("userInt('pileupJetId:fullId')",int,doc="Pileup ID flags for pre-UL trainings"),
240242
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"),
241243
qgl = Var("userFloat('qgl')",float,doc="Quark vs Gluon likelihood discriminator",precision=10),
242244
hfsigmaEtaEta = Var("userFloat('hfJetShowerShape:sigmaEtaEta')",float,doc="sigmaEtaEta for HF jets (noise discriminating variable)",precision=10),
@@ -269,9 +271,13 @@
269271
btagDeepFlavC = Var("bDiscriminator('pfDeepFlavourJetTags:probc')",float,doc="DeepFlavour charm tag discriminator",precision=10),
270272
)
271273
for modifier in run2_miniAOD_80XLegacy, run2_nanoAOD_94X2016:
272-
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"))
273-
run2_jme_2016.toModify( jetTable.variables, puIdDisc = Var("userFloat('pileupJetId:fullDiscriminant')",float,doc="Pilup ID discriminant with 80X (2016) training",precision=10))
274-
run2_jme_2017.toModify( jetTable.variables, puIdDisc = Var("userFloat('puId94XDisc')", float,doc="Pilup ID discriminant with 94X (2017) training",precision=10))
274+
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"))
275+
run2_jme_2016.toModify( jetTable.variables, puIdDisc = Var("userFloat('pileupJetId:fullDiscriminant')",float,doc="Pileup ID discriminant with 80X (2016) training",precision=10))
276+
run2_jme_2017.toModify( jetTable.variables, puId = Var("userInt('puId106XUL17Id')", int,doc="Pileup ID flags with 106X (2017) training"))
277+
run2_jme_2017.toModify( jetTable.variables, puIdDisc = Var("userFloat('puId106XUL17Disc')", float,doc="Pileup ID discriminant with 106X (2017) training",precision=10))
278+
for modifier in run2_nanoAOD_94XMiniAODv1, run2_nanoAOD_94XMiniAODv2:
279+
modifier.toModify( jetTable.variables, puIdDisc = Var("userFloat('puId94XDisc')", float,doc="Pileup ID discriminant with 94X (2017) training",precision=10))
280+
275281

276282
bjetNN= cms.EDProducer("BJetEnergyRegressionMVA",
277283
backend = cms.string("TF"),
@@ -470,7 +476,7 @@
470476
doc="index of second subjet"),
471477

472478
# btagDeepC = Var("bDiscriminator('pfDeepCSVJetTags:probc')",float,doc="CMVA V2 btag discriminator",precision=10),
473-
#puIdDisc = Var("userFloat('pileupJetId:fullDiscriminant')",float,doc="Pilup ID discriminant",precision=10),
479+
#puIdDisc = Var("userFloat('pileupJetId:fullDiscriminant')",float,doc="Pileup ID discriminant",precision=10),
474480
# nConstituents = Var("numberOfDaughters()",int,doc="Number of particles in the jet"),
475481
# rawFactor = Var("1.-jecFactor('Uncorrected')",float,doc="1 - Factor to get back to raw pT",precision=6),
476482
),
@@ -487,12 +493,12 @@
487493
# Deprecated after 106X
488494
modifier.toModify( fatJetTable.variables,
489495
btagCMVA = Var("bDiscriminator('pfCombinedMVAV2BJetTags')",float,doc="CMVA V2 btag discriminator",precision=10),
490-
btagDDBvL_noMD = Var("bDiscriminator('pfDeepDoubleBvLJetTags:probHbb')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->bb vs QCD",precision=10),
491-
btagDDCvL_noMD = Var("bDiscriminator('pfDeepDoubleCvLJetTags:probHcc')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->cc vs QCD",precision=10),
492-
btagDDCvB_noMD = Var("bDiscriminator('pfDeepDoubleCvBJetTags:probHcc')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->cc vs H(Z)->bb",precision=10),
493-
btagDDBvL = Var("bDiscriminator('pfMassIndependentDeepDoubleBvLJetTags:probHbb')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->bb vs QCD",precision=10),
494-
btagDDCvL = Var("bDiscriminator('pfMassIndependentDeepDoubleCvLJetTags:probHcc')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->cc vs QCD",precision=10),
495-
btagDDCvB = Var("bDiscriminator('pfMassIndependentDeepDoubleCvBJetTags:probHcc')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->cc vs H(Z)->bb",precision=10),
496+
btagDDBvL_noMD = Var("bDiscriminator('pfDeepDoubleBvLJetTags:probHbb')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->bb vs QCD",precision=10),
497+
btagDDCvL_noMD = Var("bDiscriminator('pfDeepDoubleCvLJetTags:probHcc')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->cc vs QCD",precision=10),
498+
btagDDCvB_noMD = Var("bDiscriminator('pfDeepDoubleCvBJetTags:probHcc')",float,doc="DeepDoubleX discriminator (no mass-decorrelation) for H(Z)->cc vs H(Z)->bb",precision=10),
499+
btagDDBvL = Var("bDiscriminator('pfMassIndependentDeepDoubleBvLJetTags:probHbb')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->bb vs QCD",precision=10),
500+
btagDDCvL = Var("bDiscriminator('pfMassIndependentDeepDoubleCvLJetTags:probHcc')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->cc vs QCD",precision=10),
501+
btagDDCvB = Var("bDiscriminator('pfMassIndependentDeepDoubleCvBJetTags:probHcc')",float,doc="DeepDoubleX (mass-decorrelated) discriminator for H(Z)->cc vs H(Z)->bb",precision=10),
496502
)
497503
run2_miniAOD_80XLegacy.toModify( fatJetTable.variables, msoftdrop_chs = Var("userFloat('ak8PFJetsCHSSoftDropMass')",float, doc="Legacy uncorrected soft drop mass with CHS",precision=10))
498504
run2_miniAOD_80XLegacy.toModify( fatJetTable.variables.tau1, expr = cms.string("userFloat(\'ak8PFJetsPuppiValueMap:NjettinessAK8PuppiTau1\')"),)
@@ -528,7 +534,7 @@
528534
variables = cms.PSet(P4Vars,
529535
btagDeepB = Var("bDiscriminator('pfDeepCSVJetTags:probb')+bDiscriminator('pfDeepCSVJetTags:probbb')",float,doc="DeepCSV b+bb tag discriminator",precision=10),
530536
btagCSVV2 = Var("bDiscriminator('pfCombinedInclusiveSecondaryVertexV2BJetTags')",float,doc=" pfCombinedInclusiveSecondaryVertexV2 b-tag discriminator (aka CSVV2)",precision=10),
531-
rawFactor = Var("1.-jecFactor('Uncorrected')",float,doc="1 - Factor to get back to raw pT",precision=6),
537+
rawFactor = Var("1.-jecFactor('Uncorrected')",float,doc="1 - Factor to get back to raw pT",precision=6),
532538
tau1 = Var("userFloat('NjettinessAK8Subjets:tau1')",float, doc="Nsubjettiness (1 axis)",precision=10),
533539
tau2 = Var("userFloat('NjettinessAK8Subjets:tau2')",float, doc="Nsubjettiness (2 axis)",precision=10),
534540
tau3 = Var("userFloat('NjettinessAK8Subjets:tau3')",float, doc="Nsubjettiness (3 axis)",precision=10),
@@ -698,12 +704,13 @@
698704
qgtagger=QGTagger.clone(srcJets="updatedJets",srcVertexCollection="offlineSlimmedPrimaryVertices")
699705

700706

701-
from RecoJets.JetProducers.PileupJetID_cfi import pileupJetId, _chsalgos_94x, _chsalgos_102x
707+
from RecoJets.JetProducers.PileupJetID_cfi import pileupJetId, _chsalgos_94x, _chsalgos_102x, _chsalgos_106X_UL17
702708
pileupJetId94X=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_94x),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")
703709
pileupJetId102X=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_102x),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")
710+
pileupJetId106XUL17=pileupJetId.clone(jets="updatedJets",algos = cms.VPSet(_chsalgos_106X_UL17),inputIsCorrected=True,applyJec=False,vertexes="offlineSlimmedPrimaryVertices")
704711

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

708715

709716
_jetSequence_2016 = jetSequence.copy()
@@ -712,8 +719,8 @@
712719
for modifier in run2_miniAOD_80XLegacy, run2_nanoAOD_94X2016:
713720
modifier.toReplaceWith(jetSequence, _jetSequence_2016)
714721

715-
#HF shower shape recomputation
716-
#Only run if needed (i.e. if default MINIAOD info is missing or outdated because of new JECs...)
722+
#HF shower shape recomputation
723+
#Only run if needed (i.e. if default MINIAOD info is missing or outdated because of new JECs...)
717724
from RecoJets.JetProducers.hfJetShowerShape_cfi import hfJetShowerShape
718725
hfJetShowerShapeforNanoAOD = hfJetShowerShape.clone(jets="updatedJets",vertices="offlineSlimmedPrimaryVertices")
719726
for modifier in run2_miniAOD_80XLegacy, run2_nanoAOD_94X2016, run2_nanoAOD_94XMiniAODv1, run2_nanoAOD_94XMiniAODv2, run2_nanoAOD_102Xv1, run2_nanoAOD_106Xv1:
@@ -723,7 +730,7 @@
723730
)
724731
modifier.toModify(updatedJetsWithUserData.userInts,
725732
hfcentralEtaStripSize = cms.InputTag('hfJetShowerShapeforNanoAOD:centralEtaStripSize'),
726-
hfadjacentEtaStripsSize = cms.InputTag('hfJetShowerShapeforNanoAOD:adjacentEtaStripsSize'),
733+
hfadjacentEtaStripsSize = cms.InputTag('hfJetShowerShapeforNanoAOD:adjacentEtaStripsSize'),
727734
)
728735
modifier.toModify( jetTable.variables, hfsigmaEtaEta = Var("userFloat('hfsigmaEtaEta')",float,doc="sigmaEtaEta for HF jets (noise discriminating variable)",precision=10))
729736
modifier.toModify( jetTable.variables, hfsigmaPhiPhi = Var("userFloat('hfsigmaPhiPhi')",float,doc="sigmaPhiPhi for HF jets (noise discriminating variable)",precision=10))

‎PhysicsTools/NanoAOD/python/nano_cff.py‎

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
discNames = cms.vstring(
6565
"pfCombinedInclusiveSecondaryVertexV2BJetTags",
6666
"pfDeepCSVJetTags:probb+pfDeepCSVJetTags:probbb", #if multiple MiniAOD branches need to be summed up (e.g., DeepCSV b+bb), separate them using '+' delimiter
67-
"pfCombinedMVAV2BJetTags"
67+
"pfCombinedMVAV2BJetTags"
6868
),
6969
discShortNames = cms.vstring(
7070
"CSVV2",
@@ -73,7 +73,7 @@
7373
),
7474
weightFiles = cms.vstring( #default settings are for 2017 94X. toModify function is called later for other eras.
7575
btagSFdir+"CSVv2_94XSF_V2_B_F.csv",
76-
btagSFdir+"DeepCSV_94XSF_V2_B_F.csv",
76+
btagSFdir+"DeepCSV_94XSF_V2_B_F.csv",
7777
"unavailable" #if SFs for an algorithm in an era is unavailable, the corresponding branch will not be stored
7878
),
7979
operatingPoints = cms.vstring("3","3","3"), #loose = 0, medium = 1, tight = 2, reshaping = 3
@@ -84,20 +84,20 @@
8484
)
8585

8686
for modifier in run2_miniAOD_80XLegacy, run2_nanoAOD_94X2016: # to be updated when SF for Summer16MiniAODv3 MC will be available
87-
modifier.toModify(btagWeightTable,
87+
modifier.toModify(btagWeightTable,
8888
cut = cms.string("pt > 25. && abs(eta) < 2.4"), #80X corresponds to 2016, |eta| < 2.4
8989
weightFiles = cms.vstring( #80X corresponds to 2016 SFs
90-
btagSFdir+"CSVv2_Moriond17_B_H.csv",
91-
"unavailable",
92-
btagSFdir+"cMVAv2_Moriond17_B_H.csv"
90+
btagSFdir+"CSVv2_Moriond17_B_H.csv",
91+
"unavailable",
92+
btagSFdir+"cMVAv2_Moriond17_B_H.csv"
9393
)
9494
)
9595

9696

9797
lheInfoTable = cms.EDProducer("LHETablesProducer",
9898
lheInfo = cms.VInputTag(cms.InputTag("externalLHEProducer"), cms.InputTag("source")),
9999
precision = cms.int32(14),
100-
storeLHEParticles = cms.bool(True)
100+
storeLHEParticles = cms.bool(True)
101101
)
102102

103103
l1bits=cms.EDProducer("L1TriggerResultsConverter", src=cms.InputTag("gtStage2Digis"), legacyL1=cms.bool(False),
@@ -106,7 +106,7 @@
106106

107107
nanoSequenceCommon = cms.Sequence(
108108
nanoMetadata + jetSequence + muonSequence + tauSequence + electronSequence+photonSequence+vertexSequence+
109-
isoTrackSequence + jetLepSequence + # must be after all the leptons
109+
isoTrackSequence + jetLepSequence + # must be after all the leptons
110110
linkedObjects +
111111
jetTables + muonTables + tauTables + electronTables + photonTables + globalTables +vertexTables+ metTables+simpleCleanerTable + isoTrackTables
112112
)
@@ -208,7 +208,35 @@ def nanoAOD_recalibrateMETs(process,isData):
208208
table.variables.muonSubtrFactor = Var("1-userFloat('muonSubtrRawPt')/(pt()*jecFactor('Uncorrected'))",float,doc="1-(muon-subtracted raw pt)/(raw pt)",precision=6)
209209
process.metTables += process.corrT1METJetTable
210210
# makePuppiesFromMiniAOD(process,True) # call this before in the global customizer otherwise it would reset photon IDs in VID
211-
runMetCorAndUncFromMiniAOD(process,isData=isData,metType="Puppi",postfix="Puppi",jetFlavor="AK4PFPuppi")
211+
nanoAOD_PuppiV15_switch = cms.PSet(
212+
recoMetFromPFCs = cms.untracked.bool(False),
213+
reclusterJets = cms.untracked.bool(False),
214+
)
215+
run2_nanoAOD_106Xv1.toModify(nanoAOD_PuppiV15_switch,recoMetFromPFCs=True,reclusterJets=True)
216+
runMetCorAndUncFromMiniAOD(process,isData=isData,metType="Puppi",postfix="Puppi",jetFlavor="AK4PFPuppi", recoMetFromPFCs=bool(nanoAOD_PuppiV15_switch.recoMetFromPFCs), reclusterJets=bool(nanoAOD_PuppiV15_switch.reclusterJets))
217+
if nanoAOD_PuppiV15_switch.reclusterJets:
218+
from RecoJets.JetProducers.ak4PFJets_cfi import ak4PFJets
219+
from PhysicsTools.PatAlgos.tools.helpers import getPatAlgosToolsTask, addToProcessAndTask
220+
task = getPatAlgosToolsTask(process)
221+
addToProcessAndTask('ak4PuppiJets', ak4PFJets.clone (src = 'puppi', doAreaFastjet = True, jetPtMin = 2.), process, task)
222+
from PhysicsTools.PatAlgos.tools.jetTools import addJetCollection
223+
addJetCollection(process,
224+
labelName = 'Puppi',
225+
jetSource = cms.InputTag('ak4PuppiJets'),
226+
algo = 'AK', rParam=0.4,
227+
genJetCollection=cms.InputTag('slimmedGenJets'),
228+
jetCorrections = ('AK4PFPuppi', ['L1FastJet', 'L2Relative', 'L3Absolute','L2L3Residual'], 'None'),
229+
pfCandidates = cms.InputTag('packedPFCandidates'),
230+
pvSource = cms.InputTag('offlineSlimmedPrimaryVertices'),
231+
svSource = cms.InputTag('slimmedSecondaryVertices'),
232+
muSource =cms.InputTag( 'slimmedMuons'),
233+
elSource = cms.InputTag('slimmedElectrons'),
234+
genParticles= cms.InputTag('prunedGenParticles'),
235+
getJetMCFlavour=False
236+
)
237+
238+
process.patJetsPuppi.addGenPartonMatch = cms.bool(False)
239+
process.patJetsPuppi.addGenJetMatch = cms.bool(False)
212240
process.nanoSequenceCommon.insert(process.nanoSequenceCommon.index(process.jetSequence),cms.Sequence(process.puppiMETSequence+process.fullPatMetSequencePuppi))
213241
return process
214242

@@ -284,7 +312,7 @@ def nanoAOD_runMETfixEE2017(process,isData):
284312
process.nanoSequenceCommon.insert(process.nanoSequenceCommon.index(jetSequence),process.fullPatMetSequenceFixEE2017)
285313

286314
def nanoAOD_customizeCommon(process):
287-
makePuppiesFromMiniAOD(process,True)
315+
makePuppiesFromMiniAOD(process,True)
288316
process.puppiNoLep.useExistingWeights = True
289317
process.puppi.useExistingWeights = True
290318
run2_nanoAOD_106Xv1.toModify(process.puppiNoLep, useExistingWeights = False)
@@ -352,7 +380,7 @@ def nanoAOD_customizeMC(process):
352380

353381
### Era dependent customization
354382
_80x_sequence = nanoSequenceCommon.copy()
355-
#remove stuff
383+
#remove stuff
356384
_80x_sequence.remove(isoTrackTables)
357385
_80x_sequence.remove(isoTrackSequence)
358386
#add stuff

0 commit comments

Comments
 (0)