Skip to content

Commit a6b8acc

Browse files
authored
Merge pull request cms-sw#34005 from bainbrid/LowPtElectrons_nanoAOD_integration_120X
LowPtElectrons: NanoAOD integration (forward port)
2 parents 2a84834 + 5ff103d commit a6b8acc

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

PhysicsTools/NanoAOD/python/lowPtElectrons_cff.py

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,22 @@
1616
)
1717
)
1818

19+
import PhysicsTools.PatAlgos.producersLayer1.electronProducer_cfi
20+
updatedLowPtElectrons = cms.EDProducer(
21+
"PATElectronUpdater",
22+
src = cms.InputTag("modifiedLowPtElectrons"),
23+
vertices = cms.InputTag("offlineSlimmedPrimaryVertices"),
24+
computeMiniIso = cms.bool(True),
25+
fixDxySign = cms.bool(False),
26+
pfCandsForMiniIso = cms.InputTag("packedPFCandidates"),
27+
miniIsoParamsB = PhysicsTools.PatAlgos.producersLayer1.electronProducer_cfi.patElectrons.miniIsoParamsB,
28+
miniIsoParamsE = PhysicsTools.PatAlgos.producersLayer1.electronProducer_cfi.patElectrons.miniIsoParamsE,
29+
)
30+
1931
from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronID_cfi import lowPtGsfElectronID
2032
lowPtPATElectronID = lowPtGsfElectronID.clone(
2133
usePAT = True,
22-
electrons = "modifiedLowPtElectrons",
34+
electrons = "updatedLowPtElectrons",
2335
unbiased = "",
2436
ModelWeights = [
2537
'RecoEgamma/ElectronIdentification/data/LowPtElectrons/LowPtElectrons_ID_2020Nov28.root',
@@ -28,8 +40,8 @@
2840

2941
isoForLowPtEle = cms.EDProducer(
3042
"EleIsoValueMapProducer",
31-
src = cms.InputTag("modifiedLowPtElectrons"),
32-
relative = cms.bool(False),
43+
src = cms.InputTag("updatedLowPtElectrons"),
44+
relative = cms.bool(True),
3345
rho_MiniIso = cms.InputTag("fixedGridRhoFastjetAll"),
3446
rho_PFIso = cms.InputTag("fixedGridRhoFastjetAll"),
3547
EAFile_MiniIso = cms.FileInPath("RecoEgamma/ElectronIdentification/data/Fall17/effAreaElectrons_cone03_pfNeuHadronsAndPhotons_94X.txt"),
@@ -38,7 +50,7 @@
3850

3951
updatedLowPtElectronsWithUserData = cms.EDProducer(
4052
"PATElectronUserDataEmbedder",
41-
src = cms.InputTag("modifiedLowPtElectrons"),
53+
src = cms.InputTag("updatedLowPtElectrons"),
4254
userFloats = cms.PSet(
4355
ID = cms.InputTag("lowPtPATElectronID"),
4456
miniIsoChg = cms.InputTag("isoForLowPtEle:miniIsoChg"),
@@ -76,9 +88,9 @@
7688
unbiased = Var("electronID('unbiased')",float,doc="ElectronSeed, pT- and dxy- agnostic BDT (raw) score"),
7789
ptbiased = Var("electronID('ptbiased')",float,doc="ElectronSeed, pT- and dxy- dependent BDT (raw) score"),
7890
# Isolation
79-
miniPFRelIso_chg = Var("userFloat('miniIsoChg')/pt",float,
91+
miniPFRelIso_chg = Var("userFloat('miniIsoChg')",float,
8092
doc="mini PF relative isolation, charged component"),
81-
miniPFRelIso_all = Var("userFloat('miniIsoAll')/pt",float,
93+
miniPFRelIso_all = Var("userFloat('miniIsoAll')",float,
8294
doc="mini PF relative isolation, total (with scaled rho*EA PU corrections)"),
8395
# Conversions
8496
convVeto = Var("passConversionVeto()",bool,doc="pass conversion veto"),
@@ -100,8 +112,6 @@
100112
dxyErr = Var("edB('PV2D')",float,doc="dxy uncertainty, in cm",precision=6),
101113
dz = Var("dB('PVDZ')",float,doc="dz (with sign) wrt first PV, in cm",precision=10),
102114
dzErr = Var("abs(edB('PVDZ'))",float,doc="dz uncertainty, in cm",precision=6),
103-
ip3d = Var("abs(dB('PV3D'))",float,doc="3D impact parameter wrt first PV, in cm",precision=10),
104-
sip3d = Var("abs(dB('PV3D')/edB('PV3D'))",float,doc="3D impact parameter significance wrt first PV, in cm",precision=10),
105115
# Cross-referencing
106116
#jetIdx
107117
#photonIdx
@@ -175,6 +185,7 @@
175185
################################################################################
176186

177187
lowPtElectronSequence = cms.Sequence(modifiedLowPtElectrons
188+
+updatedLowPtElectrons
178189
+lowPtPATElectronID
179190
+isoForLowPtEle
180191
+updatedLowPtElectronsWithUserData

PhysicsTools/NanoAOD/python/nanoDQM_cfi.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
Plot1D('unbiased', 'unbiased', 40, -10., 10., 'ElectronSeed, pT- and dxy- agnostic BDT (raw) score'),
134134
Plot1D('ptbiased', 'ptbiased', 40, -10., 10., 'ElectronSeed, pT- and dxy- dependent BDT (raw) score'),
135135
# Isolation
136-
Plot1D('miniPFRelIso_chg', 'miniPFRelIso_chg', 20, 0, 2, 'mini PF relative isolation, charged component'),
137-
Plot1D('miniPFRelIso_all', 'miniPFRelIso_all', 20, 0, 2, 'mini PF relative isolation, total (with scaled rho*EA PU corrections)'),
136+
Plot1D('miniPFRelIso_chg', 'miniPFRelIso_chg', 20, 0., 1., 'mini PF relative isolation, charged component'),
137+
Plot1D('miniPFRelIso_all', 'miniPFRelIso_all', 20, 0., 1., 'mini PF relative isolation, total (with scaled rho*EA PU corrections)'),
138138
# Conversions
139139
Plot1D('convVeto', 'convVeto', 2, -0.5, 1.5, 'pass conversion veto'),
140140
Plot1D('convWP', 'convWP', 8, -0.5, 7.5, 'conversion flag bit map: 1=Veto, 2=Loose, 3=Tight'),
@@ -154,8 +154,6 @@
154154
Plot1D('dz', 'dz', 20, -0.3, 0.3, 'dz (with sign) wrt first PV, in cm'),
155155
Plot1D('dxyErr', 'dxyErr', 20, 0., 0.2, 'dxy uncertainty, in cm'),
156156
Plot1D('dzErr', 'dzErr', 20, 0., 0.2, 'dz uncertainty, in cm'),
157-
Plot1D('ip3d', 'ip3d', 20, 0., 0.2, '3D impact parameter wrt first PV, in cm'),
158-
Plot1D('sip3d', 'sip3d', 20, 0., 20., '3D impact parameter significance wrt first PV, in cm'),
159157
),
160158
),
161159

0 commit comments

Comments
 (0)