From 22e6bd29fe148739c7f0d6a92507a2699e1d294f Mon Sep 17 00:00:00 2001 From: Slava Krutelyov Date: Fri, 31 Jul 2020 07:32:18 +0200 Subject: [PATCH] egamma scale and smearing in run2_miniAOD_UL; part of PR 29826 --- RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py | 5 +++-- .../python/egammaObjectModificationsInMiniAOD_cff.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py index fe82fcb3eb1b6..27bc26dffcb8c 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py @@ -110,8 +110,9 @@ from RecoEgamma.EgammaPhotonProducers.reducedEgamma_tools import calibrateReducedEgamma from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17 -modifyReducedEGammaRun2MiniAOD9XFall17_ = run2_miniAOD_94XFall17.makeProcessModifier(calibrateReducedEgamma) from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy -modifyReducedEGammaRun2MiniAOD8XLegacy_ = run2_miniAOD_80XLegacy.makeProcessModifier(calibrateReducedEgamma) +from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL +modifyReducedEGammaRun2MiniAOD = ( + run2_miniAOD_94XFall17 | run2_miniAOD_80XLegacy | run2_miniAOD_UL).makeProcessModifier(calibrateReducedEgamma) from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 pp_on_AA_2018.toModify( reducedEgamma, ootPhotons = cms.InputTag("") ) diff --git a/RecoEgamma/EgammaTools/python/egammaObjectModificationsInMiniAOD_cff.py b/RecoEgamma/EgammaTools/python/egammaObjectModificationsInMiniAOD_cff.py index 95cb404fe1924..1f74dd1e3103f 100644 --- a/RecoEgamma/EgammaTools/python/egammaObjectModificationsInMiniAOD_cff.py +++ b/RecoEgamma/EgammaTools/python/egammaObjectModificationsInMiniAOD_cff.py @@ -147,8 +147,9 @@ def appendEgamma8XLegacyAppendableModifiers (modifiers): modifiers.append(egamma8XLegacyEtScaleSysModifier) from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17 -run2_miniAOD_94XFall17.toModify(egamma_modifications,appendReducedEgammaEnergyScaleAndSmearingModifier) - +from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL +(run2_miniAOD_94XFall17 | run2_miniAOD_UL).toModify(egamma_modifications,appendReducedEgammaEnergyScaleAndSmearingModifier) + from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy #80X doesnt have the bug which prevents GsfTracks used to match conversions so set true run2_miniAOD_80XLegacy.toModify(egamma9X105XUpdateModifier,allowGsfTrackForConvs = True)