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.

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

[NanoAOD, JMENano] Updates for Nano and JMENano #42728

Merged
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
02316b9
Add RUN3WINTER22PUPPIrunsBCDEprompt jetId version
nurfikri89 Aug 18, 2023
1464f81
Add charged and neutral multiplicities
nurfikri89 Aug 18, 2023
4cffe8a
Fix jetId config. Add charged and neutral multiplicities. Update subj…
nurfikri89 Aug 18, 2023
5c79982
Add charged and neutral multiplicities
nurfikri89 Aug 18, 2023
97d15ef
Update jet variables in nanoDQM
nurfikri89 Aug 18, 2023
67b6594
Update jet ID for Run3
nurfikri89 Aug 18, 2023
b9e0230
Add HF energy fractions
nurfikri89 Aug 18, 2023
b30d2b8
Rename function to setup puppi for packedPFCandidates. Set puppi and …
nurfikri89 Aug 18, 2023
9fcb70b
Update puppi setup by using setupPuppiForPackedPF() from jetTools.py
nurfikri89 Aug 18, 2023
6740923
Increase pT thresholds for AK4GEN, AK8GEN, AK4CHS jets. Remove PUID/Q…
nurfikri89 Aug 18, 2023
f408c9a
Update nanojmeDQM
nurfikri89 Aug 18, 2023
d53faca
Rename some variables. Revert to 'packedpuppi' as default.
nurfikri89 Aug 23, 2023
da91555
Make it optional to use a different PuppiProducer label rather than a…
nurfikri89 Aug 23, 2023
772b537
Rename multiplicity variables in nanojmeDQM_cff.py
nurfikri89 Aug 24, 2023
f2cbbbe
Fix typo
nurfikri89 Aug 24, 2023
15db740
Fixes to variable names and PuppiProducer label
nurfikri89 Aug 24, 2023
9fce076
Make it optional to use other PuppiProducer label used for puppi jets…
nurfikri89 Aug 24, 2023
9f03ad5
Check isPFJet() for multiplicity variables because in MiniAOD, AK8 je…
nurfikri89 Sep 5, 2023
325107b
Add energy fractions for AK8 jets. Change data type and dummy value f…
nurfikri89 Sep 5, 2023
3615d26
Use int16 data type for multiplicity variables
nurfikri89 Sep 5, 2023
f3b31fa
Remove unused HF energy fractions from modifiers
nurfikri89 Sep 5, 2023
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
Prev Previous commit
Next Next commit
Add HF energy fractions
nurfikri89 committed Sep 5, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit b9e023037ebd066a753519613da7b3a5b78830ba
13 changes: 11 additions & 2 deletions PhysicsTools/NanoAOD/python/jetsAK4_CHS_cff.py
Original file line number Diff line number Diff line change
@@ -178,6 +178,8 @@
neHEF = Var("neutralHadronEnergyFraction()", float, doc="neutral Hadron Energy Fraction", precision= 6),
chEmEF = Var("chargedEmEnergyFraction()", float, doc="charged Electromagnetic Energy Fraction", precision= 6),
neEmEF = Var("neutralEmEnergyFraction()", float, doc="neutral Electromagnetic Energy Fraction", precision= 6),
hfHEF = Var("HFHadronEnergyFraction()",float,doc="hadronic Energy Fraction in HF",precision= 6),
hfEmEF = Var("HFEMEnergyFraction()",float,doc="electromagnetic Energy Fraction in HF",precision= 6),
muEF = Var("muonEnergyFraction()", float, doc="muon Energy Fraction", precision= 6),
chFPV0EF = Var("userFloat('chFPV0EF')", float, doc="charged fromPV==0 Energy Fraction (energy excluded from CHS jets). Previously called betastar.", precision= 6),
)
@@ -208,7 +210,12 @@
btagCSVV2 = Var("bDiscriminator('pfCombinedInclusiveSecondaryVertexV2BJetTags')",float,doc=" pfCombinedInclusiveSecondaryVertexV2 b-tag discriminator (aka CSVV2)",precision=10),
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),
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),
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)
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),
# Remove for V9
chMultiplicity = None,
neMultiplicity = None,
hfHEF = None,
hfEmEF = None
)

(run3_nanoAOD_122 | run3_nanoAOD_124).toModify(
@@ -224,7 +231,9 @@
PNetRegPtRawRes = None,
# Remove for V11 and earlier Run3 versions
chMultiplicity = None,
neMultiplicity = None
neMultiplicity = None,
hfHEF = None,
hfEmEF = None
)

bjetNN = cms.EDProducer("BJetEnergyRegressionMVA",
7 changes: 6 additions & 1 deletion PhysicsTools/NanoAOD/python/jetsAK4_Puppi_cff.py
Original file line number Diff line number Diff line change
@@ -128,6 +128,8 @@
neHEF = Var("neutralHadronEnergyFraction()", float, doc="neutral Hadron Energy Fraction", precision= 6),
chEmEF = Var("chargedEmEnergyFraction()", float, doc="charged Electromagnetic Energy Fraction", precision= 6),
neEmEF = Var("neutralEmEnergyFraction()", float, doc="neutral Electromagnetic Energy Fraction", precision= 6),
hfHEF = Var("HFHadronEnergyFraction()",float,doc="hadronic Energy Fraction in HF",precision= 6),
hfEmEF = Var("HFEMEnergyFraction()",float,doc="electromagnetic Energy Fraction in HF",precision= 6),
muEF = Var("muonEnergyFraction()", float, doc="muon Energy Fraction", precision= 6),
)
)
@@ -151,8 +153,11 @@
PNetRegPtRawCorr = None,
PNetRegPtRawCorrNeutrino = None,
PNetRegPtRawRes = None,
# Remove for V11 and earlier Run3 versions
chMultiplicity = None,
neMultiplicity = None
neMultiplicity = None,
hfHEF = None,
hfEmEF = None
)

#jets are not as precise as muons
5 changes: 3 additions & 2 deletions PhysicsTools/NanoAOD/python/nanoDQM_cff.py
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ def _match(name):
_Jet_Run2_plots = cms.VPSet()
for plot in nanoDQM.vplots.Jet.plots:
_Jet_Run2_plots.append(plot)
if 'Multiplicity' not in plot.name.value():
if 'Multiplicity' not in plot.name.value() and 'hfHEF' not in plot.name.value() and 'hfEmEF' not in plot.name.value():
_Jet_Run2_plots.append(plot)
_Jet_Run2_plots.extend([
Plot1D('btagCSVV2', 'btagCSVV2', 20, -1, 1, ' pfCombinedInclusiveSecondaryVertexV2 b-tag discriminator (aka CSVV2)'),
@@ -106,7 +106,8 @@ def _match(name):

_Jet_EarlyRun3_plots = cms.VPSet()
for plot in nanoDQM.vplots.Jet.plots:
if 'PNet' not in plot.name.value() and 'Multiplicity' not in plot.name.value():
if 'PNet' not in plot.name.value() and 'Multiplicity' not in plot.name.value() \
and 'hfHEF' not in plot.name.value() and 'hfEmEF' not in plot.name.value():
_Jet_EarlyRun3_plots.append(plot)

_SubJet_Run2_plots = cms.VPSet()
2 changes: 2 additions & 0 deletions PhysicsTools/NanoAOD/python/nanoDQM_cfi.py
Original file line number Diff line number Diff line change
@@ -453,6 +453,8 @@
Plot1D('puId', 'puId', 8, -0.5, 7.5, 'Pilup ID flags'),
Plot1D('puIdDisc', 'puIdDisc', 20, -1, 1, 'Pilup ID discriminant with 102X (2018) training'),
Plot1D('qgl', 'qgl', 20, 0, 1, 'Quark vs Gluon likelihood discriminator'),
Plot1D('hfHEF', 'hfHEF', 20, 0, 1, 'hadronic Energy Fraction in HF'),
Plot1D('hfEmEF', 'hfEmEF', 20, 0, 1, 'electromagnetic Energy Fraction in HF'),
Plot1D('hfsigmaEtaEta', 'hfsigmaEtaEta', 20, 0, 0.2, 'sigmaEtaEta for HF jets (noise discriminating variable)'),
Plot1D('hfsigmaPhiPhi', 'hfsigmaPhiPhi', 20, 0, 0.2, 'sigmaPhiPhi for HF jets (noise discriminating variable)'),
Plot1D('hfcentralEtaStripSize', 'hfcentralEtaStripSize', 10, 0, 10, 'eta size of the central tower strip in HF (noise discriminating variable)'),