From 228bf6e028fb1994c739e3ac0af88fd90f3c2b87 Mon Sep 17 00:00:00 2001
From: Christopher Jones <chrisdjones15@gmail.com>
Date: Mon, 7 Oct 2024 09:03:13 -0500
Subject: [PATCH] Improve constructor for PhotonIsolationCalculator

It is in general better to use a constructor rather than a setup
method.
---
 .../src/GEDPhotonProducer.cc                  | 13 +++---
 .../src/PhotonProducer.cc                     | 40 +++++++------------
 .../interface/PhotonIsolationCalculator.h     | 18 ++++-----
 .../src/PhotonIsolationCalculator.cc          | 12 +++---
 4 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc
index 6344c589a519b..009467ec07b4d 100644
--- a/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc
+++ b/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc
@@ -426,14 +426,13 @@ GEDPhotonProducer::GEDPhotonProducer(const edm::ParameterSet& config, const Cach
 
   //moved from beginRun to here, I dont see how this could cause harm as its just reading in the exactly same parameters each run
   if (!recoStep_.isFinal()) {
-    photonIsoCalculator_ = std::make_unique<PhotonIsolationCalculator>();
     edm::ParameterSet isolationSumsCalculatorSet = config.getParameter<edm::ParameterSet>("isolationSumsCalculatorSet");
-    photonIsoCalculator_->setup(isolationSumsCalculatorSet,
-                                flagsexclEB_,
-                                flagsexclEE_,
-                                severitiesexclEB_,
-                                severitiesexclEE_,
-                                consumesCollector());
+    photonIsoCalculator_ = std::make_unique<PhotonIsolationCalculator>(isolationSumsCalculatorSet,
+                                                                       flagsexclEB_,
+                                                                       flagsexclEE_,
+                                                                       severitiesexclEB_,
+                                                                       severitiesexclEE_,
+                                                                       consumesCollector());
     edm::ParameterSet mipVariableSet = config.getParameter<edm::ParameterSet>("mipVariableSet");
     photonMIPHaloTagger_ = std::make_unique<PhotonMIPHaloTagger>(mipVariableSet, consumesCollector());
   }
diff --git a/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc
index 3f2b6d6189962..a90c6cece1802 100644
--- a/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc
+++ b/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc
@@ -125,6 +125,20 @@ DEFINE_FWK_MODULE(PhotonProducer);
 PhotonProducer::PhotonProducer(const edm::ParameterSet& config)
     : caloGeomToken_(esConsumes()),
       topologyToken_(esConsumes()),
+      flagsexclEB_{StringToEnumValue<EcalRecHit::Flags>(
+          config.getParameter<std::vector<std::string>>("RecHitFlagToBeExcludedEB"))},
+      flagsexclEE_{StringToEnumValue<EcalRecHit::Flags>(
+          config.getParameter<std::vector<std::string>>("RecHitFlagToBeExcludedEE"))},
+      severitiesexclEB_{StringToEnumValue<EcalSeverityLevel::SeverityLevel>(
+          config.getParameter<std::vector<std::string>>("RecHitSeverityToBeExcludedEB"))},
+      severitiesexclEE_{StringToEnumValue<EcalSeverityLevel::SeverityLevel>(
+          config.getParameter<std::vector<std::string>>("RecHitSeverityToBeExcludedEE"))},
+      photonIsolationCalculator_(config.getParameter<edm::ParameterSet>("isolationSumsCalculatorSet"),
+                                 flagsexclEB_,
+                                 flagsexclEE_,
+                                 severitiesexclEB_,
+                                 severitiesexclEE_,
+                                 consumesCollector()),
       photonMIPHaloTagger_(config.getParameter<edm::ParameterSet>("mipVariableSet"), consumesCollector()),
       photonEnergyCorrector_(config, consumesCollector()) {
   // use configuration file to setup input/output collection names
@@ -154,28 +168,6 @@ PhotonProducer::PhotonProducer(const edm::ParameterSet& config)
     hcalCutsToken_ = esConsumes<HcalPFCuts, HcalPFCutsRcd>(edm::ESInputTag("", "withTopo"));
   }
 
-  //AA
-  //Flags and Severities to be excluded from photon calculations
-  const std::vector<std::string> flagnamesEB =
-      config.getParameter<std::vector<std::string>>("RecHitFlagToBeExcludedEB");
-
-  const std::vector<std::string> flagnamesEE =
-      config.getParameter<std::vector<std::string>>("RecHitFlagToBeExcludedEE");
-
-  flagsexclEB_ = StringToEnumValue<EcalRecHit::Flags>(flagnamesEB);
-
-  flagsexclEE_ = StringToEnumValue<EcalRecHit::Flags>(flagnamesEE);
-
-  const std::vector<std::string> severitynamesEB =
-      config.getParameter<std::vector<std::string>>("RecHitSeverityToBeExcludedEB");
-
-  severitiesexclEB_ = StringToEnumValue<EcalSeverityLevel::SeverityLevel>(severitynamesEB);
-
-  const std::vector<std::string> severitynamesEE =
-      config.getParameter<std::vector<std::string>>("RecHitSeverityToBeExcludedEE");
-
-  severitiesexclEE_ = StringToEnumValue<EcalSeverityLevel::SeverityLevel>(severitynamesEE);
-
   ElectronHcalHelper::Configuration cfgCone, cfgBc;
   cfgCone.hOverEConeSize = hOverEConeSize_;
   if (cfgCone.hOverEConeSize > 0) {
@@ -245,10 +237,6 @@ PhotonProducer::PhotonProducer(const edm::ParameterSet& config)
   preselCutValuesEndcap_.push_back(config.getParameter<double>("sigmaIetaIetaCutEndcap"));
   //
 
-  edm::ParameterSet isolationSumsCalculatorSet = config.getParameter<edm::ParameterSet>("isolationSumsCalculatorSet");
-  photonIsolationCalculator_.setup(
-      isolationSumsCalculatorSet, flagsexclEB_, flagsexclEE_, severitiesexclEB_, severitiesexclEE_, consumesCollector());
-
   // Register the product
   produces<reco::PhotonCollection>(PhotonCollection_);
 }
diff --git a/RecoEgamma/PhotonIdentification/interface/PhotonIsolationCalculator.h b/RecoEgamma/PhotonIdentification/interface/PhotonIsolationCalculator.h
index 85204bd35ebb1..8983bce0d8e9a 100644
--- a/RecoEgamma/PhotonIdentification/interface/PhotonIsolationCalculator.h
+++ b/RecoEgamma/PhotonIdentification/interface/PhotonIsolationCalculator.h
@@ -32,16 +32,14 @@ class EcalSeverityLevelAlgoRcd;
 
 class PhotonIsolationCalculator {
 public:
-  PhotonIsolationCalculator() {}
-
-  ~PhotonIsolationCalculator() {}
-
-  void setup(const edm::ParameterSet& conf,
-             std::vector<int> const& flagsEB_,
-             std::vector<int> const& flagsEE_,
-             std::vector<int> const& severitiesEB_,
-             std::vector<int> const& severitiesEE_,
-             edm::ConsumesCollector&& iC);
+  PhotonIsolationCalculator(const edm::ParameterSet& conf,
+                            std::vector<int> const& flagsEB_,
+                            std::vector<int> const& flagsEE_,
+                            std::vector<int> const& severitiesEB_,
+                            std::vector<int> const& severitiesEE_,
+                            edm::ConsumesCollector&& iC);
+
+  ~PhotonIsolationCalculator() = default;
 
   void calculate(const reco::Photon*,
                  const edm::Event&,
diff --git a/RecoEgamma/PhotonIdentification/src/PhotonIsolationCalculator.cc b/RecoEgamma/PhotonIdentification/src/PhotonIsolationCalculator.cc
index 1774cb2f047ee..be5f5e940a591 100644
--- a/RecoEgamma/PhotonIdentification/src/PhotonIsolationCalculator.cc
+++ b/RecoEgamma/PhotonIdentification/src/PhotonIsolationCalculator.cc
@@ -26,12 +26,12 @@
 
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgoRcd.h"
 
-void PhotonIsolationCalculator::setup(const edm::ParameterSet& conf,
-                                      std::vector<int> const& flagsEB,
-                                      std::vector<int> const& flagsEE,
-                                      std::vector<int> const& severitiesEB,
-                                      std::vector<int> const& severitiesEE,
-                                      edm::ConsumesCollector&& iC) {
+PhotonIsolationCalculator::PhotonIsolationCalculator(const edm::ParameterSet& conf,
+                                                     std::vector<int> const& flagsEB,
+                                                     std::vector<int> const& flagsEE,
+                                                     std::vector<int> const& severitiesEB,
+                                                     std::vector<int> const& severitiesEE,
+                                                     edm::ConsumesCollector&& iC) {
   trackInputTag_ = iC.consumes<reco::TrackCollection>(conf.getParameter<edm::InputTag>("trackProducer"));
   beamSpotProducerTag_ = iC.consumes<reco::BeamSpot>(conf.getParameter<edm::InputTag>("beamSpotProducer"));
   barrelecalCollection_ =