Skip to content

Commit

Permalink
Merge pull request cms-sw#5 from jainshilpi/UL2016_nanoMiniSS
Browse files Browse the repository at this point in the history 
merging updates from Shilpi
  • Loading branch information
@sroychow
sroychow authored Mar 1, 2021
2 parents 08a34b7 + 03fb8b6 commit 6928d38
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 13 deletions.
74 changes: 67 additions & 7 deletions PhysicsTools/NanoAOD/python/electrons_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
)
run2_miniAOD_80XLegacy.toModify( slimmedElectronsUpdated, computeMiniIso = True )
# bypass the update to 106X in 106X to only pick up the IP sign fix
run2_egamma_2016.toModify(slimmedElectronsUpdated, src = cms.InputTag("slimmedElectrons"))
run2_egamma_2017.toModify(slimmedElectronsUpdated, src = cms.InputTag("slimmedElectrons"))
run2_egamma_2018.toModify(slimmedElectronsUpdated, src = cms.InputTag("slimmedElectrons"))
run2_nanoAOD_106Xv1.toModify(slimmedElectronsUpdated, src = cms.InputTag("slimmedElectrons"))
Expand Down Expand Up @@ -129,7 +130,7 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):



for modifier in run2_egamma_2017,run2_egamma_2018,run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
for modifier in run2_egamma_2016,run2_egamma_2017,run2_egamma_2018,run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
modifier.toModify(bitmapVIDForEle, src = "slimmedElectronsUpdated")
modifier.toModify(bitmapVIDForEleSpring15, src = "slimmedElectronsUpdated")
modifier.toModify(bitmapVIDForEleSum16, src = "slimmedElectronsUpdated")
Expand All @@ -144,7 +145,7 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
EAFile_MiniIso = cms.FileInPath("RecoEgamma/ElectronIdentification/data/Fall17/effAreaElectrons_cone03_pfNeuHadronsAndPhotons_94X.txt"),
EAFile_PFIso = cms.FileInPath("RecoEgamma/ElectronIdentification/data/Fall17/effAreaElectrons_cone03_pfNeuHadronsAndPhotons_94X.txt"),
)
for modifier in run2_egamma_2017,run2_egamma_2018, run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
for modifier in run2_egamma_2016,run2_egamma_2017,run2_egamma_2018, run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
modifier.toModify(isoForEle, src = "slimmedElectronsUpdated")

run2_miniAOD_80XLegacy.toModify(isoForEle, src = "slimmedElectronsUpdated",
Expand All @@ -159,15 +160,27 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
srcLep = cms.InputTag("slimmedElectrons"),
srcVtx = cms.InputTag("offlineSlimmedPrimaryVertices"),
)
for modifier in run2_egamma_2017,run2_egamma_2018, run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
for modifier in run2_egamma_2016,run2_egamma_2017,run2_egamma_2018, run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
modifier.toModify(ptRatioRelForEle, srcLep = "slimmedElectronsUpdated")

seedGainEle = cms.EDProducer("ElectronSeedGainProducer", src = cms.InputTag("slimmedElectrons"))
for modifier in run2_egamma_2017,run2_egamma_2018, run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
for modifier in run2_egamma_2016,run2_egamma_2017,run2_egamma_2018, run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
modifier.toModify(seedGainEle, src = "slimmedElectronsUpdated")

import RecoEgamma.EgammaTools.calibratedEgammas_cff

calibratedPatElectronsUL16preVFP = RecoEgamma.EgammaTools.calibratedEgammas_cff.calibratedPatElectrons.clone(
produceCalibratedObjs = False,
correctionFile = cms.string("EgammaAnalysis/ElectronTools/data/ScalesSmearings/Run2016_UltraLegacy_preVFP_RunFineEtaR9Gain"),
)
(run2_egamma_2016 & tracker_apv_vfp30_2016).toModify(calibratedPatElectronsUL16preVFP, src = "slimmedElectronsUpdated")

calibratedPatElectronsUL16postVFP = RecoEgamma.EgammaTools.calibratedEgammas_cff.calibratedPatElectrons.clone(
produceCalibratedObjs = False,
correctionFile = cms.string("EgammaAnalysis/ElectronTools/data/ScalesSmearings/Run2016_UltraLegacy_postVFP_RunFineEtaR9Gain"),
)
(run2_egamma_2016 & ~tracker_apv_vfp30_2016).toModify(calibratedPatElectronsUL16postVFP, src = "slimmedElectronsUpdated")

calibratedPatElectronsUL17 = RecoEgamma.EgammaTools.calibratedEgammas_cff.calibratedPatElectrons.clone(
produceCalibratedObjs = False,
correctionFile = cms.string("EgammaAnalysis/ElectronTools/data/ScalesSmearings/Run2017_24Feb2020_runEtaR9Gain_v2"),
Expand All @@ -190,7 +203,7 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
produceCalibratedObjs = False,
correctionFile = cms.string("EgammaAnalysis/ElectronTools/data/ScalesSmearings/Run2017_17Nov2017_v1_ele_unc"),
)
for modifier in run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016:
for modifier in run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016:
modifier.toModify(calibratedPatElectrons94X, src = "slimmedElectronsUpdated")

calibratedPatElectrons102X = RecoEgamma.EgammaTools.calibratedEgammas_cff.calibratedPatElectrons.clone(
Expand Down Expand Up @@ -250,9 +263,28 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
jetForLepJetVar = cms.InputTag("ptRatioRelForEle:jetForLepJetVar") # warning: Ptr is null if no match is found
),
)
for modifier in run2_egamma_2017,run2_egamma_2018, run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
for modifier in run2_egamma_2016,run2_egamma_2017,run2_egamma_2018, run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
modifier.toModify(slimmedElectronsWithUserData, src = "slimmedElectronsUpdated")

(run2_egamma_2016 & tracker_apv_vfp30_2016).toModify(slimmedElectronsWithUserData.userFloats,
ecalTrkEnergyErrPostCorrNew = cms.InputTag("calibratedPatElectronsUL16preVFP","ecalTrkEnergyErrPostCorr"),
ecalTrkEnergyPreCorrNew = cms.InputTag("calibratedPatElectronsUL16preVFP","ecalTrkEnergyPreCorr"),
ecalTrkEnergyPostCorrNew = cms.InputTag("calibratedPatElectronsUL16preVFP","ecalTrkEnergyPostCorr"),
energyScaleUp = cms.InputTag("calibratedPatElectronsUL16preVFP","energyScaleUp"),
energyScaleDown = cms.InputTag("calibratedPatElectronsUL16preVFP","energyScaleDown"),
energySigmaUp = cms.InputTag("calibratedPatElectronsUL16preVFP","energySigmaUp"),
energySigmaDown = cms.InputTag("calibratedPatElectronsUL16preVFP","energySigmaDown"),
)

(run2_egamma_2016 & ~tracker_apv_vfp30_2016).toModify(slimmedElectronsWithUserData.userFloats,
ecalTrkEnergyErrPostCorrNew = cms.InputTag("calibratedPatElectronsUL16postVFP","ecalTrkEnergyErrPostCorr"),
ecalTrkEnergyPreCorrNew = cms.InputTag("calibratedPatElectronsUL16postVFP","ecalTrkEnergyPreCorr"),
ecalTrkEnergyPostCorrNew = cms.InputTag("calibratedPatElectronsUL16postVFP","ecalTrkEnergyPostCorr"),
energyScaleUp = cms.InputTag("calibratedPatElectronsUL16postVFP","energyScaleUp"),
energyScaleDown = cms.InputTag("calibratedPatElectronsUL16postVFP","energyScaleDown"),
energySigmaUp = cms.InputTag("calibratedPatElectronsUL16postVFP","energySigmaUp"),
energySigmaDown = cms.InputTag("calibratedPatElectronsUL16postVFP","energySigmaDown"),
)

run2_egamma_2017.toModify(slimmedElectronsWithUserData.userFloats,
ecalTrkEnergyErrPostCorrNew = cms.InputTag("calibratedPatElectronsUL17","ecalTrkEnergyErrPostCorr"),
Expand Down Expand Up @@ -282,11 +314,21 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
ecalTrkEnergyErrPostCorrNew = cms.InputTag("calibratedPatElectrons80XLegacy","ecalTrkEnergyErrPostCorr"),
ecalTrkEnergyPreCorrNew = cms.InputTag("calibratedPatElectrons80XLegacy","ecalTrkEnergyPreCorr"),
ecalTrkEnergyPostCorrNew = cms.InputTag("calibratedPatElectrons80XLegacy","ecalTrkEnergyPostCorr"),
energyScaleUp = cms.InputTag("calibratedPatElectrons80XLegacy","energyScaleUp"),
energyScaleDown = cms.InputTag("calibratedPatElectrons80XLegacy","energyScaleDown"),
energySigmaUp = cms.InputTag("calibratedPatElectrons80XLegacy","energySigmaUp"),
energySigmaDown = cms.InputTag("calibratedPatElectrons80XLegacy","energySigmaDown"),

)
run2_nanoAOD_94XMiniAODv1.toModify(slimmedElectronsWithUserData.userFloats,
ecalTrkEnergyErrPostCorrNew = cms.InputTag("calibratedPatElectrons94X","ecalTrkEnergyErrPostCorr"),
ecalTrkEnergyPreCorrNew = cms.InputTag("calibratedPatElectrons94X","ecalTrkEnergyPreCorr"),
ecalTrkEnergyPostCorrNew = cms.InputTag("calibratedPatElectrons94X","ecalTrkEnergyPostCorr"),
energyScaleUp = cms.InputTag("calibratedPatElectrons94X","energyScaleUp"),
energyScaleDown = cms.InputTag("calibratedPatElectrons94X","energyScaleDown"),
energySigmaUp = cms.InputTag("calibratedPatElectrons94X","energySigmaUp"),
energySigmaDown = cms.InputTag("calibratedPatElectrons94X","energySigmaDown"),

)


Expand All @@ -298,12 +340,22 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
ecalTrkEnergyErrPostCorrNew = cms.InputTag("calibratedPatElectrons94X","ecalTrkEnergyErrPostCorr"),
ecalTrkEnergyPreCorrNew = cms.InputTag("calibratedPatElectrons94X","ecalTrkEnergyPreCorr"),
ecalTrkEnergyPostCorrNew = cms.InputTag("calibratedPatElectrons94X","ecalTrkEnergyPostCorr"),
energyScaleUp = cms.InputTag("calibratedPatElectrons94X","energyScaleUp"),
energyScaleDown = cms.InputTag("calibratedPatElectrons94X","energyScaleDown"),
energySigmaUp = cms.InputTag("calibratedPatElectrons94X","energySigmaUp"),
energySigmaDown = cms.InputTag("calibratedPatElectrons94X","energySigmaDown"),

)

run2_nanoAOD_102Xv1.toModify(slimmedElectronsWithUserData.userFloats,
ecalTrkEnergyErrPostCorrNew = cms.InputTag("calibratedPatElectrons102X","ecalTrkEnergyErrPostCorr"),
ecalTrkEnergyPreCorrNew = cms.InputTag("calibratedPatElectrons102X","ecalTrkEnergyPreCorr"),
ecalTrkEnergyPostCorrNew = cms.InputTag("calibratedPatElectrons102X","ecalTrkEnergyPostCorr"),
energyScaleUp = cms.InputTag("calibratedPatElectrons102X","energyScaleUp"),
energyScaleDown = cms.InputTag("calibratedPatElectrons102X","energyScaleDown"),
energySigmaUp = cms.InputTag("calibratedPatElectrons102X","energySigmaUp"),
energySigmaDown = cms.InputTag("calibratedPatElectrons102X","energySigmaDown"),

)

run2_miniAOD_80XLegacy.toModify(slimmedElectronsWithUserData.userIntFromBools,
Expand Down Expand Up @@ -447,7 +499,7 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):
#the94X miniAOD V2 had a bug in the scale and smearing for electrons in the E/p comb
#therefore we redo it but but we need use a new name for the userFloat as we cant override existing userfloats
#for technical reasons
for modifier in run2_egamma_2017,run2_egamma_2018, run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_miniAOD_80XLegacy,run2_nanoAOD_102Xv1:
for modifier in run2_egamma_2016, run2_egamma_2017,run2_egamma_2018, run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_miniAOD_80XLegacy,run2_nanoAOD_102Xv1:
modifier.toModify(electronTable.variables,
pt = Var("pt*userFloat('ecalTrkEnergyPostCorrNew')/userFloat('ecalTrkEnergyPreCorrNew')", float, precision=-1, doc="p_{T}"),
energyErr = Var("userFloat('ecalTrkEnergyErrPostCorrNew')", float, precision=6, doc="energy error of the cluster-track combination"),
Expand Down Expand Up @@ -545,6 +597,14 @@ def _get_bitmapVIDForEle_docstring(modules,WorkingPoints):

_withULAndUpdate_sequence = cms.Sequence(slimmedElectronsUpdated + electronSequence.copy())

_withUL16preVFPAndUpdateScale_sequence = _withULAndUpdate_sequence.copy()
_withUL16preVFPAndUpdateScale_sequence.replace(slimmedElectronsWithUserData, calibratedPatElectronsUL16preVFP + slimmedElectronsWithUserData)
(run2_egamma_2016 & tracker_apv_vfp30_2016).toReplaceWith(electronSequence, _withUL16preVFPAndUpdateScale_sequence)

_withUL16postVFPAndUpdateScale_sequence = _withULAndUpdate_sequence.copy()
_withUL16postVFPAndUpdateScale_sequence.replace(slimmedElectronsWithUserData, calibratedPatElectronsUL16postVFP + slimmedElectronsWithUserData)
(run2_egamma_2016 & ~tracker_apv_vfp30_2016).toReplaceWith(electronSequence, _withUL16postVFPAndUpdateScale_sequence)

_withUL17AndUpdateScale_sequence = _withULAndUpdate_sequence.copy()
_withUL17AndUpdateScale_sequence.replace(slimmedElectronsWithUserData, calibratedPatElectronsUL17 + slimmedElectronsWithUserData)
run2_egamma_2017.toReplaceWith(electronSequence, _withUL17AndUpdateScale_sequence)
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/NanoAOD/python/nano_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def nanoAOD_activateVID(process):
for modname in electron_id_modules_WorkingPoints_nanoAOD.modules:
setupAllVIDIdsInModule(process,modname,setupVIDElectronSelection)
process.electronSequence.insert(process.electronSequence.index(process.bitmapVIDForEle),process.egmGsfElectronIDSequence)
for modifier in run2_egamma_2017,run2_egamma_2018,run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
for modifier in run2_egamma_2016,run2_egamma_2017,run2_egamma_2018,run2_miniAOD_80XLegacy,run2_nanoAOD_94XMiniAODv1,run2_nanoAOD_94XMiniAODv2,run2_nanoAOD_94X2016,run2_nanoAOD_102Xv1,run2_nanoAOD_106Xv1:
modifier.toModify(process.electronMVAValueMapProducer, src = "slimmedElectronsUpdated")
modifier.toModify(process.egmGsfElectronIDs, physicsObjectSrc = "slimmedElectronsUpdated")

Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/NanoAOD/python/nano_eras_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
from Configuration.Eras.Modifier_run2_nanoAOD_102Xv1_cff import run2_nanoAOD_102Xv1
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv1_cff import run2_nanoAOD_106Xv1
from Configuration.Eras.Modifier_run2_nanoAOD_106Xv2_cff import run2_nanoAOD_106Xv2
from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016

Loading

0 comments on commit 6928d38

Please sign in to comment.