Skip to content

Commit 90274e0

Browse files
cmsbuildcmsbuild
authored
Merge pull request #48539 from see-saw28/remove_EGM_SaS_for_Run2_reprocessing
Remove EGM Scale and Smearing for Run2 reprocessing and update old EPcombination parameters
2 parents ee0e559 + 73a5609 commit 90274e0

File tree

3 files changed

+17
-62
lines changed

3 files changed

+17
-62
lines changed

‎PhysicsTools/NanoAOD/python/electrons_cff.py‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -231,17 +231,6 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
231231
toModify(slimmedElectronsWithUserData.userInts,
232232
VIDNestedWPBitmap = None)
233233

234-
run2_egamma.toModify(
235-
slimmedElectronsWithUserData.userFloats,
236-
ecalTrkEnergyErrPostCorrNew = cms.InputTag("calibratedPatElectronsNano","ecalTrkEnergyErrPostCorr"),
237-
ecalTrkEnergyPreCorrNew = cms.InputTag("calibratedPatElectronsNano","ecalTrkEnergyPreCorr"),
238-
ecalTrkEnergyPostCorrNew = cms.InputTag("calibratedPatElectronsNano","ecalTrkEnergyPostCorr"),
239-
energyScaleUpNew = cms.InputTag("calibratedPatElectronsNano","energyScaleUp"),
240-
energyScaleDownNew = cms.InputTag("calibratedPatElectronsNano","energyScaleDown"),
241-
energySigmaUpNew = cms.InputTag("calibratedPatElectronsNano","energySigmaUp"),
242-
energySigmaDownNew = cms.InputTag("calibratedPatElectronsNano","energySigmaDown")
243-
)
244-
245234
(run2_egamma_2016).toModify(
246235
slimmedElectronsWithUserData.userFloats,
247236
mvaHZZIso = "electronMVAValueMapProducer:ElectronMVAEstimatorRun2Summer16ULIdIsoValues"
@@ -453,16 +442,7 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
453442
)
454443

455444
(run2_egamma).toModify(
456-
# energy scale/smearing: only for Run2
457445
electronTable.variables,
458-
pt = Var("pt*userFloat('ecalTrkEnergyPostCorrNew')/userFloat('ecalTrkEnergyPreCorrNew')", float, precision=-1, doc="p_{T}"),
459-
energyErr = Var("userFloat('ecalTrkEnergyErrPostCorrNew')", float, precision=6, doc="energy error of the cluster-track combination"),
460-
ptPreCorr = Var("pt", float, doc="pt of the electron before energy corrections"),
461-
scEtOverPt = Var("(superCluster().energy()/(pt*userFloat('ecalTrkEnergyPostCorrNew')/userFloat('ecalTrkEnergyPreCorrNew')*cosh(superCluster().eta())))-1",float,doc="(supercluster transverse energy)/pt-1",precision=8),
462-
dEscaleUp=Var("userFloat('ecalTrkEnergyPostCorrNew')-userFloat('energyScaleUpNew')", float, doc="ecal energy scale shifted 1 sigma up(adding gain/stat/syst in quadrature)", precision=8),
463-
dEscaleDown=Var("userFloat('ecalTrkEnergyPostCorrNew')-userFloat('energyScaleDownNew')", float, doc="ecal energy scale shifted 1 sigma down (adding gain/stat/syst in quadrature)", precision=8),
464-
dEsigmaUp=Var("userFloat('ecalTrkEnergyPostCorrNew')-userFloat('energySigmaUpNew')", float, doc="ecal energy smearing value shifted 1 sigma up", precision=8),
465-
dEsigmaDown=Var("userFloat('ecalTrkEnergyPostCorrNew')-userFloat('energySigmaDownNew')", float, doc="ecal energy smearing value shifted 1 sigma up", precision=8),
466446
# Fall17V2 IDs and isolations are only for Run2. The names of these IDs and isolations are same as in Run3.
467447
mvaIso = Var("userFloat('mvaIso_Fall17V2')",float,doc="MVA Iso ID score, Fall17V2"),
468448
mvaIso_WP80 = Var("userInt('mvaIso_Fall17V2_WP80')",bool,doc="MVA Iso ID WP80, Fall17V2"),
@@ -529,14 +509,13 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
529509
genparticles = cms.InputTag("finalGenParticles"),
530510
)
531511

532-
electronTask = cms.Task(bitmapVIDForEle,bitmapVIDForEleFall17V2,bitmapVIDForEleHEEP,isoForEle,isoForEleFall17V2,ptRatioRelForEle,seedGainEle,calibratedPatElectronsNano,slimmedElectronsWithUserData,finalElectrons)
512+
electronTask = cms.Task(bitmapVIDForEle,bitmapVIDForEleFall17V2,bitmapVIDForEleHEEP,isoForEle,isoForEleFall17V2,ptRatioRelForEle,seedGainEle,slimmedElectronsWithUserData,finalElectrons)
533513
electronTablesTask = cms.Task(electronPROMPTMVA, electronTable)
534514
electronMCTask = cms.Task(tautaggerForMatching, matchingElecPhoton, electronsMCMatchForTable, electronsMCMatchForTableAlt, electronMCTable)
535515

536516
_electronTask_Run2 = electronTask.copy()
537517
_electronTask_Run2.remove(bitmapVIDForEle)
538518
_electronTask_Run2.remove(isoForEle)
539-
_electronTask_Run2.add(calibratedPatElectronsNano)
540519
run2_egamma.toReplaceWith(electronTask, _electronTask_Run2)
541520

542521
# Revert back to AK4 CHS jets for Run2 inputs

‎PhysicsTools/NanoAOD/python/photons_cff.py‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -166,17 +166,6 @@ def make_bitmapVID_docstring(id_modules_working_points_pset):
166166
toModify(slimmedPhotonsWithUserData.userInts,
167167
VIDNestedWPBitmap = None)
168168

169-
run2_egamma.toModify(
170-
slimmedPhotonsWithUserData.userFloats,
171-
ecalEnergyErrPostCorrNew = cms.InputTag("calibratedPatPhotonsNano","ecalEnergyErrPostCorr"),
172-
ecalEnergyPreCorrNew = cms.InputTag("calibratedPatPhotonsNano","ecalEnergyPreCorr"),
173-
ecalEnergyPostCorrNew = cms.InputTag("calibratedPatPhotonsNano","ecalEnergyPostCorr"),
174-
energyScaleUpNew = cms.InputTag("calibratedPatPhotonsNano","energyScaleUp"),
175-
energyScaleDownNew = cms.InputTag("calibratedPatPhotonsNano","energyScaleDown"),
176-
energySigmaUpNew = cms.InputTag("calibratedPatPhotonsNano","energySigmaUp"),
177-
energySigmaDownNew = cms.InputTag("calibratedPatPhotonsNano","energySigmaDown"),
178-
)
179-
180169

181170
finalPhotons = cms.EDFilter("PATPhotonRefSelector",
182171
src = cms.InputTag("slimmedPhotonsWithUserData"),
@@ -281,9 +270,6 @@ def make_bitmapVID_docstring(id_modules_working_points_pset):
281270
#these eras need to make the energy correction, hence the "New". Also save only Fall17V2 IDS in Run2, No Run3 Winter22V1 and quadratic iso in Run2
282271
run2_egamma.toModify(
283272
photonTable.variables,
284-
pt = Var("pt*userFloat('ecalEnergyPostCorrNew')/userFloat('ecalEnergyPreCorrNew')", float, precision=-1, doc="p_{T}"),
285-
energyErr = Var("userFloat('ecalEnergyErrPostCorrNew')",float,doc="energy error of the cluster from regression",precision=6),
286-
ptPreCorr = Var("pt",float,doc="pt of the photon before energy corrections"),
287273
cutBased = Var(
288274
"userInt('cutBasedID_Fall17V2_loose')+userInt('cutBasedID_Fall17V2_medium')+userInt('cutBasedID_Fall17V2_tight')",
289275
"uint8",
@@ -325,15 +311,6 @@ def make_bitmapVID_docstring(id_modules_working_points_pset):
325311
docString = cms.string("MC matching to status==1 photons or electrons"),
326312
)
327313

328-
#adding 4 most imp scale & smearing variables to table
329-
run2_egamma.toModify(
330-
photonTable.variables,
331-
dEscaleUp=Var("userFloat('ecalEnergyPostCorrNew') - userFloat('energyScaleUpNew')", float, doc="ecal energy scale shifted 1 sigma up (adding gain/stat/syst in quadrature)", precision=8),
332-
dEscaleDown=Var("userFloat('ecalEnergyPostCorrNew') - userFloat('energyScaleDownNew')", float, doc="ecal energy scale shifted 1 sigma down (adding gain/stat/syst in quadrature)", precision=8),
333-
dEsigmaUp=Var("userFloat('ecalEnergyPostCorrNew') - userFloat('energySigmaUpNew')", float, doc="ecal energy smearing value shifted 1 sigma up", precision=8),
334-
dEsigmaDown=Var("userFloat('ecalEnergyPostCorrNew') - userFloat('energySigmaDownNew')", float, doc="ecal energy smearing value shifted 1 sigma up", precision=8),
335-
)
336-
337314

338315
photonTask = cms.Task(bitmapVIDForPho, bitmapVIDForPhoRun2, isoForPho, hOverEForPho, isoForPhoFall17V2, seedGainPho, slimmedPhotonsWithUserData, finalPhotons)
339316

@@ -344,5 +321,4 @@ def make_bitmapVID_docstring(id_modules_working_points_pset):
344321
_photonTask_Run2.remove(bitmapVIDForPho)
345322
_photonTask_Run2.remove(isoForPho)
346323
_photonTask_Run2.remove(hOverEForPho)
347-
_photonTask_Run2.add(calibratedPatPhotonsNano)
348324
run2_egamma.toReplaceWith(photonTask, _photonTask_Run2)

‎RecoEgamma/EgammaTools/python/calibratedEgammas_cff.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,36 @@
3131
recHitCollectionEE = 'reducedEgamma:reducedEERecHits'
3232
)
3333

34+
# This is now the same configuration as the one used in the Egamma regression v3 in 106XUL
3435
ecalTrkCombinationRegression = cms.PSet(
3536
ecalTrkRegressionConfig = cms.PSet(
36-
rangeMinLowEt = cms.double(-1.),
37-
rangeMaxLowEt = cms.double(3.0),
38-
rangeMinHighEt = cms.double(-1.),
39-
rangeMaxHighEt = cms.double(3.0),
40-
lowEtHighEtBoundary = cms.double(50.),
37+
rangeMinLowEt = cms.double(0.2),
38+
rangeMaxLowEt = cms.double(2.0),
39+
rangeMinHighEt = cms.double(0.2),
40+
rangeMaxHighEt = cms.double(2.0),
41+
lowEtHighEtBoundary = cms.double(999999.),
4142
forceHighEnergyTrainingIfSaturated = cms.bool(False),
42-
ebLowEtForestName = cms.ESInputTag('', 'electron_eb_ECALTRK_lowpt'),
43-
ebHighEtForestName = cms.ESInputTag('', 'electron_eb_ECALTRK'),
44-
eeLowEtForestName = cms.ESInputTag('', 'electron_ee_ECALTRK_lowpt'),
45-
eeHighEtForestName = cms.ESInputTag('', 'electron_ee_ECALTRK')
43+
ebLowEtForestName = cms.ESInputTag("", 'electron_eb_ecalTrk_1To300_0p2To2_mean'),
44+
ebHighEtForestName = cms.ESInputTag("", 'electron_eb_ecalTrk_1To300_0p2To2_mean'),
45+
eeLowEtForestName = cms.ESInputTag("", 'electron_ee_ecalTrk_1To300_0p2To2_mean'),
46+
eeHighEtForestName = cms.ESInputTag("", 'electron_ee_ecalTrk_1To300_0p2To2_mean'),
4647
),
4748
ecalTrkRegressionUncertConfig = cms.PSet(
4849
rangeMinLowEt = cms.double(0.0002),
4950
rangeMaxLowEt = cms.double(0.5),
5051
rangeMinHighEt = cms.double(0.0002),
5152
rangeMaxHighEt = cms.double(0.5),
52-
lowEtHighEtBoundary = cms.double(50.),
53+
lowEtHighEtBoundary = cms.double(999999.),
5354
forceHighEnergyTrainingIfSaturated = cms.bool(False),
54-
ebLowEtForestName = cms.ESInputTag('', 'electron_eb_ECALTRK_lowpt_var'),
55-
ebHighEtForestName = cms.ESInputTag('', 'electron_eb_ECALTRK_var'),
56-
eeLowEtForestName = cms.ESInputTag('', 'electron_ee_ECALTRK_lowpt_var'),
57-
eeHighEtForestName = cms.ESInputTag('', 'electron_ee_ECALTRK_var')
55+
ebLowEtForestName = cms.ESInputTag("", 'electron_eb_ecalTrk_1To300_0p0002To0p5_sigma'),
56+
ebHighEtForestName = cms.ESInputTag("", 'electron_eb_ecalTrk_1To300_0p0002To0p5_sigma'),
57+
eeLowEtForestName = cms.ESInputTag("", 'electron_ee_ecalTrk_1To300_0p0002To0p5_sigma'),
58+
eeHighEtForestName = cms.ESInputTag("", 'electron_ee_ecalTrk_1To300_0p0002To0p5_sigma'),
5859
),
5960
maxEcalEnergyForComb=cms.double(200.),
6061
minEOverPForComb=cms.double(0.025),
6162
maxEPDiffInSigmaForComb=cms.double(15.),
62-
maxRelTrkMomErrForComb=cms.double(10.),
63-
63+
maxRelTrkMomErrForComb=cms.double(10.),
6464
)
6565

6666
import RecoEgamma.EgammaTools.calibratedElectronProducer_cfi as _mod_ele

0 commit comments

Comments
 (0)