Skip to content

Commit c5b624a

Browse files
hqucmshqucms
committed
NanoV15-Lite for Run2UL.
1 parent 12e5a7e commit c5b624a

File tree

5 files changed

+29
-125
lines changed

5 files changed

+29
-125
lines changed

‎PhysicsTools/NanoAOD/python/boostedTaus_cff.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
src = cms.InputTag("slimmedTausBoosted"),
1313
cut = cms.string("pt > 25 && tauID('decayModeFindingNewDMs') && (tauID('byVVLooseIsolationMVArun2DBoldDMwLT') || tauID('byVVLooseIsolationMVArun2DBnewDMwLT') || tauID('byBoostedDeepTau20161718v2p0VSjetraw') > {})".format(0.82))
1414
)
15-
run2_nanoAOD_106Xv2.toModify(
16-
finalBoostedTaus,
17-
cut = "pt > 25 && tauID('decayModeFindingNewDMs') && (tauID('byVVLooseIsolationMVArun2DBoldDMwLT') || tauID('byVVLooseIsolationMVArun2DBoldDMdR0p3wLT') || tauID('byVVLooseIsolationMVArun2DBnewDMwLT') || tauID('byBoostedDeepTau20161718v2p0VSjetraw') > {})".format(0.82)
18-
)
1915

2016
boostedTauTable = simplePATTauFlatTableProducer.clone(
2117
src = cms.InputTag("linkedObjects", "boostedTaus"),
@@ -71,17 +67,6 @@
7167
_boostedTauVarsAntiEleMVA,
7268
_boostedDeepTauRunIIv2p0Vars
7369
)
74-
_boostedTauVarsWithDr03 = cms.PSet(
75-
_boostedTauVarsBase,
76-
_boostedTauVarsMVAIso,
77-
_boostedTauVarsMVAIsoDr03,
78-
_boostedTauVarsAntiEleMVA,
79-
_boostedDeepTauRunIIv2p0Vars
80-
)
81-
run2_nanoAOD_106Xv2.toModify(
82-
boostedTauTable,
83-
variables = _boostedTauVarsWithDr03
84-
)
8570

8671
boostedTausMCMatchLepTauForTable = tausMCMatchLepTauForTable.clone(
8772
src = boostedTauTable.src

‎PhysicsTools/NanoAOD/python/jetsAK4_Puppi_cff.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,6 @@
116116
)
117117
)
118118

119-
run2_nanoAOD_ANY.toModify(
120-
jetPuppiTable.variables,
121-
btagCSVV2 = Var("bDiscriminator('pfCombinedInclusiveSecondaryVertexV2BJetTags')",float,doc=" pfCombinedInclusiveSecondaryVertexV2 b-tag discriminator (aka CSVV2)",precision=10),
122-
btagDeepB = Var("?(bDiscriminator('pfDeepCSVJetTags:probb')+bDiscriminator('pfDeepCSVJetTags:probbb'))>=0?bDiscriminator('pfDeepCSVJetTags:probb')+bDiscriminator('pfDeepCSVJetTags:probbb'):-1",float,doc="DeepCSV b+bb tag discriminator",precision=10),
123-
btagDeepCvL = Var("?bDiscriminator('pfDeepCSVJetTags:probc')>=0?bDiscriminator('pfDeepCSVJetTags:probc')/(bDiscriminator('pfDeepCSVJetTags:probc')+bDiscriminator('pfDeepCSVJetTags:probudsg')):-1", float,doc="DeepCSV c vs udsg discriminator",precision=10),
124-
btagDeepCvB = Var("?bDiscriminator('pfDeepCSVJetTags:probc')>=0?bDiscriminator('pfDeepCSVJetTags:probc')/(bDiscriminator('pfDeepCSVJetTags:probc')+bDiscriminator('pfDeepCSVJetTags:probb')+bDiscriminator('pfDeepCSVJetTags:probbb')):-1",float,doc="DeepCSV c vs b+bb discriminator",precision=10)
125-
)
126-
127119
run3_nanoAOD_pre142X.toModify(
128120
jetPuppiTable.variables,
129121
puIdDisc = None,

‎PhysicsTools/NanoAOD/python/jetsAK8_cff.py‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -127,45 +127,6 @@
127127
)
128128
)
129129

130-
run2_nanoAOD_ANY.toModify(
131-
fatJetTable.variables,
132-
btagCSVV2 = Var("bDiscriminator('pfCombinedInclusiveSecondaryVertexV2BJetTags')",float,doc=" pfCombinedInclusiveSecondaryVertexV2 b-tag discriminator (aka CSVV2)",precision=10),
133-
# Remove for V9
134-
chMultiplicity = None,
135-
neMultiplicity = None,
136-
chHEF = None,
137-
neHEF = None,
138-
chEmEF = None,
139-
neEmEF = None,
140-
muEF = None
141-
)
142-
143-
(run2_nanoAOD_106Xv2).toModify(
144-
fatJetTable.variables,
145-
# Restore taggers that were decommisionned for Run-3
146-
btagDeepB = Var("?(bDiscriminator('pfDeepCSVJetTags:probb')+bDiscriminator('pfDeepCSVJetTags:probbb'))>=0?bDiscriminator('pfDeepCSVJetTags:probb')+bDiscriminator('pfDeepCSVJetTags:probbb'):-1",float,doc="DeepCSV b+bb tag discriminator",precision=10),
147-
btagHbb = Var("bDiscriminator('pfBoostedDoubleSecondaryVertexAK8BJetTags')",float,doc="Higgs to BB tagger discriminator",precision=10),
148-
btagDDBvLV2 = Var("bDiscriminator('pfMassIndependentDeepDoubleBvLV2JetTags:probHbb')",float,doc="DeepDoubleX V2(mass-decorrelated) discriminator for H(Z)->bb vs QCD",precision=10),
149-
btagDDCvLV2 = Var("bDiscriminator('pfMassIndependentDeepDoubleCvLV2JetTags:probHcc')",float,doc="DeepDoubleX V2 (mass-decorrelated) discriminator for H(Z)->cc vs QCD",precision=10),
150-
btagDDCvBV2 = Var("bDiscriminator('pfMassIndependentDeepDoubleCvBV2JetTags:probHcc')",float,doc="DeepDoubleX V2 (mass-decorrelated) discriminator for H(Z)->cc vs H(Z)->bb",precision=10),
151-
deepTag_TvsQCD = Var("bDiscriminator('pfDeepBoostedDiscriminatorsJetTags:TvsQCD')",float,doc="DeepBoostedJet tagger top vs QCD discriminator",precision=10),
152-
deepTag_WvsQCD = Var("bDiscriminator('pfDeepBoostedDiscriminatorsJetTags:WvsQCD')",float,doc="DeepBoostedJet tagger W vs QCD discriminator",precision=10),
153-
deepTag_ZvsQCD = Var("bDiscriminator('pfDeepBoostedDiscriminatorsJetTags:ZvsQCD')",float,doc="DeepBoostedJet tagger Z vs QCD discriminator",precision=10),
154-
deepTag_H = Var("bDiscriminator('pfDeepBoostedJetTags:probHbb')+bDiscriminator('pfDeepBoostedJetTags:probHcc')+bDiscriminator('pfDeepBoostedJetTags:probHqqqq')",float,doc="DeepBoostedJet tagger H(bb,cc,4q) sum",precision=10),
155-
deepTag_QCD = Var("bDiscriminator('pfDeepBoostedJetTags:probQCDbb')+bDiscriminator('pfDeepBoostedJetTags:probQCDcc')+bDiscriminator('pfDeepBoostedJetTags:probQCDb')+bDiscriminator('pfDeepBoostedJetTags:probQCDc')+bDiscriminator('pfDeepBoostedJetTags:probQCDothers')",float,doc="DeepBoostedJet tagger QCD(bb,cc,b,c,others) sum",precision=10),
156-
deepTag_QCDothers = Var("bDiscriminator('pfDeepBoostedJetTags:probQCDothers')",float,doc="DeepBoostedJet tagger QCDothers value",precision=10),
157-
deepTagMD_TvsQCD = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:TvsQCD')",float,doc="Mass-decorrelated DeepBoostedJet tagger top vs QCD discriminator",precision=10),
158-
deepTagMD_WvsQCD = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:WvsQCD')",float,doc="Mass-decorrelated DeepBoostedJet tagger W vs QCD discriminator",precision=10),
159-
deepTagMD_ZvsQCD = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZvsQCD')",float,doc="Mass-decorrelated DeepBoostedJet tagger Z vs QCD discriminator",precision=10),
160-
deepTagMD_ZHbbvsQCD = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHbbvsQCD')",float,doc="Mass-decorrelated DeepBoostedJet tagger Z/H->bb vs QCD discriminator",precision=10),
161-
deepTagMD_ZbbvsQCD = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZbbvsQCD')",float,doc="Mass-decorrelated DeepBoostedJet tagger Z->bb vs QCD discriminator",precision=10),
162-
deepTagMD_HbbvsQCD = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:HbbvsQCD')",float,doc="Mass-decorrelated DeepBoostedJet tagger H->bb vs QCD discriminator",precision=10),
163-
deepTagMD_ZHccvsQCD = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHccvsQCD')",float,doc="Mass-decorrelated DeepBoostedJet tagger Z/H->cc vs QCD discriminator",precision=10),
164-
deepTagMD_H4qvsQCD = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:H4qvsQCD')",float,doc="Mass-decorrelated DeepBoostedJet tagger H->4q vs QCD discriminator",precision=10),
165-
deepTagMD_bbvsLight = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:bbvsLight')",float,doc="Mass-decorrelated DeepBoostedJet tagger Z/H/gluon->bb vs light flavour discriminator",precision=10),
166-
deepTagMD_ccvsLight = Var("bDiscriminator('pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ccvsLight')",float,doc="Mass-decorrelated DeepBoostedJet tagger Z/H/gluon->cc vs light flavour discriminator",precision=10),
167-
)
168-
169130
##############################################################
170131
## DeepInfoAK8:Start
171132
## - To be used in nanoAOD_customizeCommon() in nano_cff.py
@@ -232,16 +193,6 @@ def nanoAOD_addDeepInfoAK8(process, addDeepBTag, addDeepBoostedJet, addDeepDoubl
232193
jecPayload = cms.untracked.string('AK8PFPuppi')
233194
)
234195

235-
236-
# ParticleNet legacy jet tagger is already in 106Xv2 MINIAOD,
237-
# add ParticleNet legacy mass regression, new combined tagger + mass regression, and GlobalParT
238-
run2_nanoAOD_106Xv2.toModify(
239-
nanoAOD_addDeepInfoAK8_switch,
240-
nanoAOD_addParticleNetMassLegacy_switch = True,
241-
nanoAOD_addParticleNet_switch = True,
242-
nanoAOD_addGlobalParT_switch = True,
243-
)
244-
245196
################################################
246197
## DeepInfoAK8:End
247198
#################################################
@@ -270,22 +221,6 @@ def nanoAOD_addDeepInfoAK8(process, addDeepBTag, addDeepBoostedJet, addDeepDoubl
270221
)
271222
)
272223

273-
run2_nanoAOD_ANY.toModify(
274-
subJetTable.variables,
275-
btagCSVV2 = Var("bDiscriminator('pfCombinedInclusiveSecondaryVertexV2BJetTags')",float,doc=" pfCombinedInclusiveSecondaryVertexV2 b-tag discriminator (aka CSVV2)",precision=10)
276-
)
277-
278-
(run2_nanoAOD_106Xv2).toModify(
279-
subJetTable.variables,
280-
area = None,
281-
UParTAK4RegPtRawCorr = None,
282-
UParTAK4RegPtRawCorrNeutrino = None,
283-
UParTAK4RegPtRawRes = None,
284-
UParTAK4V1RegPtRawCorr = None,
285-
UParTAK4V1RegPtRawCorrNeutrino = None,
286-
UParTAK4V1RegPtRawRes = None,
287-
)
288-
289224
run3_nanoAOD_pre142X.toModify(
290225
subJetTable.variables,
291226
btagDeepFlavB = None,

‎PhysicsTools/NanoAOD/python/nanoDQM_cff.py‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,6 @@
55
from PhysicsTools.NanoAOD.nanoDQM_tools_cff import *
66
from PhysicsTools.NanoAOD.nano_eras_cff import *
77

8-
_boostedTauPlotsV10 = cms.VPSet()
9-
for plot in nanoDQM.vplots.boostedTau.plots:
10-
_boostedTauPlotsV10.append(plot)
11-
_boostedTauPlotsV10.extend([
12-
Plot1D('idMVAoldDMdR032017v2', 'idMVAoldDMdR032017v2', 11, -0.5, 10.5, 'IsolationMVArun2017v2DBoldDMdR0p3wLT ID working point (2017v2): int 1 = VVLoose, 2 = VLoose, 3 = Loose, 4 = Medium, 5 = Tight, 6 = VTight, 7 = VVTight'),
13-
Plot1D('rawMVAoldDMdR032017v2', 'rawMVAoldDMdR032017v2', 20, -1, 1, 'byIsolationMVArun2017v2DBoldDMdR0p3wLT raw output discriminator (2017v2)')
14-
])
15-
16-
(run2_nanoAOD_106Xv2).toModify(
17-
nanoDQM.vplots.boostedTau,
18-
plots = _boostedTauPlotsV10
19-
)
20-
218
## EGamma custom nano
229
_Electron_extra_plots = nanoDQM.vplots.Electron.plots.copy()
2310
_Electron_extra_plots.extend([

‎PhysicsTools/NanoAOD/python/nano_cff.py‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646
vertices=cms.InputTag("slimmedSecondaryVertices")
4747
)
4848

49-
# Switch to AK4 CHS jets for Run-2
50-
run2_nanoAOD_ANY.toModify(
51-
linkedObjects, jets="finalJets"
52-
)
53-
5449
from PhysicsTools.NanoAOD.lhcInfoProducer_cfi import lhcInfoProducer
5550
lhcInfoTable = lhcInfoProducer.clone()
5651
(~run3_common).toModify(
@@ -72,15 +67,6 @@
7267
isoTrackTablesTask,softActivityTablesTask
7368
)
7469

75-
# Replace AK4 Puppi with AK4 CHS for Run-2
76-
_nanoTableTaskCommonRun2 = nanoTableTaskCommon.copy()
77-
_nanoTableTaskCommonRun2.replace(jetPuppiTask, jetTask)
78-
_nanoTableTaskCommonRun2.replace(jetPuppiForMETTask, jetForMETTask)
79-
_nanoTableTaskCommonRun2.replace(jetPuppiTablesTask, jetTablesTask)
80-
run2_nanoAOD_ANY.toReplaceWith(
81-
nanoTableTaskCommon, _nanoTableTaskCommonRun2
82-
)
83-
8470
nanoSequenceCommon = cms.Sequence(nanoTableTaskCommon)
8571

8672
nanoSequenceOnlyFullSim = cms.Sequence(triggerObjectTablesTask)
@@ -101,6 +87,24 @@
10187
nanoSequenceMC = nanoSequenceFS.copy()
10288
nanoSequenceMC.insert(nanoSequenceFS.index(nanoSequenceCommon)+1,nanoSequenceOnlyFullSim)
10389

90+
91+
def RecomputePuppiWeightsALL(proc):
92+
"""
93+
Recompute Puppi weights and PuppiMET and rebuild slimmedJetsPuppi and slimmedJetsAK8.
94+
"""
95+
runOnMC = True
96+
if hasattr(proc, "NANOEDMAODoutput") or hasattr(proc, "NANOAODoutput"):
97+
runOnMC = False
98+
99+
from PhysicsTools.PatAlgos.tools.puppiJetMETReclusteringFromMiniAOD_cff import puppiJetMETReclusterFromMiniAOD
100+
proc = puppiJetMETReclusterFromMiniAOD(proc, runOnMC=runOnMC, useExistingWeights=False,
101+
reclusterAK4MET=True,
102+
reclusterAK8=True,
103+
)
104+
105+
return proc
106+
107+
104108
# modifier which adds new tauIDs
105109
import RecoTauTag.RecoTau.tools.runTauIdMVA as tauIdConfig
106110
def nanoAOD_addTauIds(process, idsToRun=[]):
@@ -203,19 +207,22 @@ def nanoAOD_customizeCommon(process):
203207

204208
process = nanoAOD_activateVID(process)
205209

210+
# recompute Puppi weights and remake AK4, AK8 Puppi jets and PuppiMET
206211
run2_nanoAOD_106Xv2.toModify(
207-
nanoAOD_addDeepInfoAK4CHS_switch, nanoAOD_addParticleNet_switch=True,
208-
nanoAOD_addRobustParTAK4Tag_switch=False,
209-
nanoAOD_addUnifiedParTAK4Tag_switch=True,
212+
process, lambda p: RecomputePuppiWeightsALL(p)
210213
)
211-
214+
212215
# This function is defined in jetsAK4_Puppi_cff.py
213216
process = nanoAOD_addDeepInfoAK4(process,
214217
addParticleNet=nanoAOD_addDeepInfoAK4_switch.nanoAOD_addParticleNet_switch,
215218
addRobustParTAK4=nanoAOD_addDeepInfoAK4_switch.nanoAOD_addRobustParTAK4Tag_switch,
216219
addUnifiedParTAK4=nanoAOD_addDeepInfoAK4_switch.nanoAOD_addUnifiedParTAK4Tag_switch
217220
)
218221

222+
# Add PNet for Tau
223+
run2_nanoAOD_106Xv2.toModify(
224+
nanoAOD_addDeepInfoAK4CHS_switch, nanoAOD_addParticleNet_switch=True,
225+
)
219226
# This function is defined in jetsAK4_CHS_cff.py
220227
process = nanoAOD_addDeepInfoAK4CHS(process,
221228
addDeepBTag=nanoAOD_addDeepInfoAK4CHS_switch.nanoAOD_addDeepBTag_switch,
@@ -247,12 +254,10 @@ def nanoAOD_customizeCommon(process):
247254
).toModify(
248255
process, lambda p : nanoAOD_addTauIds(p, nanoAOD_tau_switch.idsToAdd.value())
249256
)
250-
251-
# Add Unified Tagger for CHS jets (PNet) for Run 2 era,
252-
# but don't add Unified Tagger for PUPPI jets (as different PUPPI tune
253-
# and base jet algorithm)
257+
258+
# Add Unified Tagger for Run 2 era
254259
(run2_nanoAOD_106Xv2).toModify(
255-
nanoAOD_tau_switch, addPNet = True
260+
nanoAOD_tau_switch, addPNet = True, addUParTInfo = True
256261
)
257262
# Add Unified Taggers for Run 3 pre 142X (pre v15) era (Unified taggers
258263
# are already added to slimmedTaus in miniAOD for newer eras)
@@ -271,7 +276,7 @@ def nanoAOD_customizeCommon(process):
271276
addUTagInfo = nanoAOD_tau_switch.addUParTInfo.value(),
272277
usePUPPIjets = True
273278
)
274-
279+
275280
nanoAOD_boostedTau_switch = cms.PSet(
276281
idsToAdd = cms.vstring()
277282
)

0 commit comments

Comments
 (0)