Merge pull request cms-sw#42513 from makortel/l1tMuonEndCapPSet

Configure SectorProcessShower objects only once in L1TMuonEndCapShowerProducer

Author: cmsbuild

L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapShowerProducer.cc

@@ -1,12 +1,28 @@
 #include "L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapShowerProducer.h"
 #include "L1Trigger/L1TMuonEndCap/interface/Common.h"
 
+namespace {
+  template <typename F>
+  void forEachProcessor(F&& func) {
+    for (int endcap = emtf::MIN_ENDCAP; endcap <= emtf::MAX_ENDCAP; ++endcap) {
+      for (int sector = emtf::MIN_TRIGSECTOR; sector <= emtf::MAX_TRIGSECTOR; ++sector) {
+        const int es = (endcap - emtf::MIN_ENDCAP) * (emtf::MAX_TRIGSECTOR - emtf::MIN_TRIGSECTOR + 1) +
+                       (sector - emtf::MIN_TRIGSECTOR);
+        func(endcap, sector, es);
+      }
+    }
+  }
+}  // namespace
+
 L1TMuonEndCapShowerProducer::L1TMuonEndCapShowerProducer(const edm::ParameterSet& iConfig)
-    : config_(iConfig),
-      tokenCSCShower_(consumes<CSCShowerDigiCollection>(iConfig.getParameter<edm::InputTag>("CSCShowerInput"))),
+    : tokenCSCShower_(consumes<CSCShowerDigiCollection>(iConfig.getParameter<edm::InputTag>("CSCShowerInput"))),
       sector_processors_shower_() {
   // Make output products
   produces<l1t::RegionalMuonShowerBxCollection>("EMTF");
+
+  forEachProcessor([&](const int endcap, const int sector, const int es) {
+    sector_processors_shower_.at(es).configure(iConfig, endcap, sector);
+  });
 }
 
 L1TMuonEndCapShowerProducer::~L1TMuonEndCapShowerProducer() {}
@@ -23,16 +39,9 @@ void L1TMuonEndCapShowerProducer::produce(edm::Event& iEvent, const edm::EventSe
 
   // ___________________________________________________________________________
   // Run the sector processors
-
-  for (int endcap = emtf::MIN_ENDCAP; endcap <= emtf::MAX_ENDCAP; ++endcap) {
-    for (int sector = emtf::MIN_TRIGSECTOR; sector <= emtf::MAX_TRIGSECTOR; ++sector) {
-      const int es = (endcap - emtf::MIN_ENDCAP) * (emtf::MAX_TRIGSECTOR - emtf::MIN_TRIGSECTOR + 1) +
-                     (sector - emtf::MIN_TRIGSECTOR);
-
-      sector_processors_shower_.at(es).configure(config_, endcap, sector);
-      sector_processors_shower_.at(es).process(showers, *out_showers);
-    }
-  }
+  forEachProcessor([&](const int endcap, const int sector, const int es) {
+    sector_processors_shower_.at(es).process(showers, *out_showers);
+  });
 
   // Fill the output products
   iEvent.put(std::move(out_showers), "EMTF");

L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapShowerProducer.h

@@ -33,7 +33,6 @@ class L1TMuonEndCapShowerProducer : public edm::stream::EDProducer<> {
   void produce(edm::Event&, const edm::EventSetup&) override;
 
 private:
-  const edm::ParameterSet& config_;
   edm::EDGetToken tokenCSCShower_;
   emtf::sector_array<SectorProcessorShower> sector_processors_shower_;
 };

L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.cc

@@ -1,9 +1,7 @@
 #include "L1TMuonEndCapTrackProducer.h"
 
 L1TMuonEndCapTrackProducer::L1TMuonEndCapTrackProducer(const edm::ParameterSet& iConfig)
-    : track_finder_(new TrackFinder(iConfig, consumesCollector())),
-      uGMT_converter_(new MicroGMTConverter()),
-      config_(iConfig) {
+    : track_finder_(new TrackFinder(iConfig, consumesCollector())), uGMT_converter_(new MicroGMTConverter()) {
   // Make output products
   produces<EMTFHitCollection>("");                      // All CSC LCTs and RPC clusters received by EMTF
   produces<EMTFTrackCollection>("");                    // All output EMTF tracks, in same format as unpacked data

L1Trigger/L1TMuonEndCap/plugins/L1TMuonEndCapTrackProducer.h

@@ -36,8 +36,6 @@ class L1TMuonEndCapTrackProducer : public edm::stream::EDProducer<> {
 private:
   std::unique_ptr<TrackFinder> track_finder_;
   std::unique_ptr<MicroGMTConverter> uGMT_converter_;
-
-  const edm::ParameterSet& config_;
 };
 
 #endif