slava's review

cms-sw · Jan 6, 2021 · 9365d7d · 9365d7d
1 parent 66d7ff4
commit 9365d7d
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 67 deletions.
diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/lowPtElectronProducer_cff.py b/PhysicsTools/PatAlgos/python/producersLayer1/lowPtElectronProducer_cff.py
@@ -80,16 +80,8 @@
 _makePatLowPtElectronsTask.add(lowPtGsfElectronID)
 
 # (3) apply energy regression
-from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronFinalizer_cfi import lowPtGsfElectrons
-lowPtGsfElectronsPostRegression = lowPtGsfElectrons.clone(previousGsfElectronsTag = "lowPtGsfElectrons")
-_makePatLowPtElectronsTask.add(lowPtGsfElectronsPostRegression)
-
-# Switch to energy-regressed electrons as input
-sourceElectronsPostRegression = "lowPtGsfElectronsPostRegression"
-run2_miniAOD_UL.toModify(lowPtElectronMatch, src = sourceElectronsPostRegression)
-run2_miniAOD_UL.toModify(patLowPtElectrons, electronSource = sourceElectronsPostRegression)
-run2_miniAOD_UL.toModify(rekeyLowPtGsfElectronSeedValueMaps, gsfElectrons = sourceElectronsPostRegression)
-run2_miniAOD_UL.toModify(lowPtGsfElectronID, electrons = sourceElectronsPostRegression)
+from RecoEgamma.EgammaElectronProducers.lowPtGsfElectrons_cfi import lowPtGsfElectrons
+_makePatLowPtElectronsTask.add(lowPtGsfElectrons)
 
 # Append to Task
 run2_miniAOD_UL.toReplaceWith(makePatLowPtElectronsTask,_makePatLowPtElectronsTask)

diff --git a/RecoEgamma/EgammaElectronProducers/plugins/LowPtGsfElectronFinalizer.cc b/RecoEgamma/EgammaElectronProducers/plugins/LowPtGsfElectronFinalizer.cc
@@ -45,9 +45,7 @@ void LowPtGsfElectronFinalizer::produce(edm::Event& event, const edm::EventSetup
   for (auto const& electron : event.get(previousGsfElectrons_)) {
     outputElectrons.emplace_back(electron);
     auto& newElectron = outputElectrons.back();
-    if (regression_) {
-      regression_->modifyObject(newElectron);
-    }
+    regression_->modifyObject(newElectron);
   }
 
   // Emplace modified electrons to event
@@ -60,7 +58,7 @@ void LowPtGsfElectronFinalizer::fillDescriptions(edm::ConfigurationDescriptions&
   edm::ParameterSetDescription psd;
   psd.setUnknown();
   desc.add<edm::ParameterSetDescription>("regressionConfig", psd);
-  descriptions.addDefault(desc);
+  descriptions.addWithDefaultLabel(desc);
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"

diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronFinalizer_cfi.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronFinalizer_cfi.py
diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSequence_cff.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSequence_cff.py
@@ -66,8 +66,8 @@
 from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronCores_cff import lowPtGsfElectronCores
 
 # Low pT electrons
+from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronsPreRegression_cfi import *
 from RecoEgamma.EgammaElectronProducers.lowPtGsfElectrons_cfi import *
-from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronFinalizer_cfi import *
 
 # Low pT Electron value maps
 from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronSeedValueMaps_cff import lowPtGsfElectronSeedValueMaps

diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronsPreRegression_cfi.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronsPreRegression_cfi.py
@@ -0,0 +1,10 @@
+from RecoEgamma.EgammaElectronProducers.gsfElectrons_cfi import ecalDrivenGsfElectrons
+
+lowPtGsfElectronsPreRegression = ecalDrivenGsfElectrons.clone(gsfElectronCoresTag = "lowPtGsfElectronCores")
+
+from Configuration.Eras.Modifier_fastSim_cff import fastSim
+fastSim.toModify(lowPtGsfElectronsPreRegression,ctfTracksTag = "generalTracksBeforeMixing")
+
+from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+pp_on_AA.toModify(lowPtGsfElectronsPreRegression.preselection, minSCEtBarrel = 15.0)
+pp_on_AA.toModify(lowPtGsfElectronsPreRegression.preselection, minSCEtEndcaps = 15.0)
diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py
@@ -1,10 +1,48 @@
-from RecoEgamma.EgammaElectronProducers.gsfElectrons_cfi import ecalDrivenGsfElectrons
+import FWCore.ParameterSet.Config as cms
 
-lowPtGsfElectronsPreRegression = ecalDrivenGsfElectrons.clone(gsfElectronCoresTag = "lowPtGsfElectronCores")
+from RecoEgamma.EgammaTools.regressionModifier_cfi import regressionModifier106XUL
 
-from Configuration.Eras.Modifier_fastSim_cff import fastSim
-fastSim.toModify(lowPtGsfElectronsPreRegression,ctfTracksTag = "generalTracksBeforeMixing")
+_lowPtRegressionModifier = regressionModifier106XUL.clone(
+    modifierName = 'EGRegressionModifierV3',
+    rhoTag = 'fixedGridRhoFastjetAll',
+    eleRegs = dict(
+        ecalOnlyMean = dict(
+            lowEtHighEtBoundary = 20.,
+            ebLowEtForestName = ":lowPtElectron_eb_ecalOnly_05To50_mean",
+            ebHighEtForestName = ":lowPtElectron_eb_ecalOnly_05To50_mean",
+            eeLowEtForestName = ":lowPtElectron_ee_ecalOnly_05To50_mean",
+            eeHighEtForestName = ":lowPtElectron_ee_ecalOnly_05To50_mean",
+            ),
+        ecalOnlySigma = dict(
+            lowEtHighEtBoundary = 20.,
+            ebLowEtForestName = ":lowPtElectron_eb_ecalOnly_05To50_sigma",
+            ebHighEtForestName = ":lowPtElectron_eb_ecalOnly_05To50_sigma",
+            eeLowEtForestName = ":lowPtElectron_ee_ecalOnly_05To50_sigma",
+            eeHighEtForestName = ":lowPtElectron_ee_ecalOnly_05To50_sigma",
+            ),
+        epComb = dict(
+            ecalTrkRegressionConfig = dict(
+                lowEtHighEtBoundary = 20.,
+                ebLowEtForestName = ":lowPtElectron_eb_ecalTrk_05To50_mean",
+                ebHighEtForestName = ":lowPtElectron_eb_ecalTrk_05To50_mean",
+                eeLowEtForestName = ":lowPtElectron_ee_ecalTrk_05To50_mean",
+                eeHighEtForestName = ":lowPtElectron_ee_ecalTrk_05To50_mean",
+                ),
+            ecalTrkRegressionUncertConfig = dict(
+                lowEtHighEtBoundary = 20.,
+                ebLowEtForestName = ":lowPtElectron_eb_ecalTrk_05To50_sigma",
+                ebHighEtForestName = ":lowPtElectron_eb_ecalTrk_05To50_sigma",
+                eeLowEtForestName = ":lowPtElectron_ee_ecalTrk_05To50_sigma",
+                eeHighEtForestName = ":lowPtElectron_ee_ecalTrk_05To50_sigma",
+                ),
+        )
+    ),
+)
 
-from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
-pp_on_AA.toModify(lowPtGsfElectronsPreRegression.preselection, minSCEtBarrel = 15.0)
-pp_on_AA.toModify(lowPtGsfElectronsPreRegression.preselection, minSCEtEndcaps = 15.0)
+lowPtGsfElectrons = cms.EDProducer("LowPtGsfElectronFinalizer",
+                                   previousGsfElectronsTag = cms.InputTag("lowPtGsfElectronsPreRegression"),
+                                   regressionConfig = _lowPtRegressionModifier,
+)
+
+from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
+run2_miniAOD_UL.toModify(lowPtGsfElectrons, previousGsfElectronsTag = "lowPtGsfElectrons::@skipCurrentProcess")