diff --git a/Configuration/Eras/python/Era_Run3_cff.py b/Configuration/Eras/python/Era_Run3_cff.py index feb3bcc93f44c..f14331bc9a000 100644 --- a/Configuration/Eras/python/Era_Run3_cff.py +++ b/Configuration/Eras/python/Era_Run3_cff.py @@ -11,6 +11,7 @@ from Configuration.Eras.Modifier_ctpps_2021_cff import ctpps_2021 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep from Configuration.Eras.Modifier_run3_nanoAOD_devel_cff import run3_nanoAOD_devel +from Configuration.Eras.Modifier_run3_egamma_cff import run3_egamma -Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018]), run3_common, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2021, dd4hep, run3_nanoAOD_devel) +Run3 = cms.ModifierChain(Run2_2018.copyAndExclude([run2_GEM_2017, ctpps_2018]), run3_common, run3_egamma, run3_GEM, run3_HB, run3_HFSL, stage2L1Trigger_2021, ctpps_2021, dd4hep, run3_nanoAOD_devel) diff --git a/Configuration/Eras/python/Modifier_run3_egamma_cff.py b/Configuration/Eras/python/Modifier_run3_egamma_cff.py new file mode 100644 index 0000000000000..5e0c0d5b734e4 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run3_egamma_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +run3_egamma =cms.Modifier() diff --git a/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py b/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py index fa20481555ded..519ce20144f20 100644 --- a/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py +++ b/RecoEgamma/EgammaTools/python/regressionModifier_cfi.py @@ -238,24 +238,31 @@ #by default we use the regression inappropriate to the main purpose of this release #life is simplier that way regressionModifier = regressionModifier94X.clone() - +regressionModifierRun2 = regressionModifier106XUL.clone() from Configuration.Eras.Modifier_run2_egamma_2016_cff import run2_egamma_2016 from Configuration.Eras.Modifier_run2_egamma_2017_cff import run2_egamma_2017 from Configuration.Eras.Modifier_run2_egamma_2018_cff import run2_egamma_2018 -(run2_egamma_2016 | run2_egamma_2017 | run2_egamma_2018).toReplaceWith(regressionModifier,regressionModifier106XUL) +(run2_egamma_2016 | run2_egamma_2017 | run2_egamma_2018).toReplaceWith(regressionModifier,regressionModifierRun2) -from Configuration.Eras.Modifier_run3_common_cff import run3_common -run3_common.toModify(regressionModifier106XUL.eleRegs.ecalOnlyMean, - rangeMinHighEt = 0.2, - rangeMaxHighEt = 2.0 +regressionModifierRun3 = regressionModifierRun2.clone( + eleRegs = dict( + ecalOnlyMean = dict( + rangeMinHighEt = 0.2, + rangeMaxHighEt = 2.0 + ) + ), + phoRegs = dict( + ecalOnlyMean = dict( + rangeMinHighEt = 0.2, + rangeMaxHighEt = 2.0 + ) + ) ) -run3_common.toModify(regressionModifier106XUL.phoRegs.ecalOnlyMean, - rangeMinHighEt = 0.2, - rangeMaxHighEt = 2.0 -) +from Configuration.Eras.Modifier_run3_egamma_cff import run3_egamma +run3_egamma.toReplaceWith(regressionModifier,regressionModifierRun3) from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive egamma_lowPt_exclusive.toReplaceWith(regressionModifier,regressionModifier103XLowPtPho)