Merge pull request #29115 from Dr15Jones/streamL1RCTProducer

Made L1RCTProducer a stream module
cms-sw · Mar 13, 2020 · 31c946c · 31c946c
2 parents a57bc8e + f647d78
commit 31c946c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h
@@ -1,7 +1,7 @@
 #ifndef L1RCTProducer_h
 #define L1RCTProducer_h
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -37,14 +37,15 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <string>
+#include <memory>
 
 class L1RCT;
 class L1RCTLookupTables;
 
-class L1RCTProducer : public edm::EDProducer {
+class L1RCTProducer : public edm::stream::EDProducer<> {
 public:
   explicit L1RCTProducer(const edm::ParameterSet &ps);
-  ~L1RCTProducer() override;
+
   void beginRun(edm::Run const &r, const edm::EventSetup &c) final;
   void beginLuminosityBlock(edm::LuminosityBlock const &lumiSeg, const edm::EventSetup &context) final;
   void produce(edm::Event &e, const edm::EventSetup &c) final;
@@ -60,8 +61,8 @@ class L1RCTProducer : public edm::EDProducer {
   void printUpdatedFedMaskVerbose();
 
 private:
-  L1RCTLookupTables *rctLookupTables;
-  L1RCT *rct;
+  std::unique_ptr<L1RCTLookupTables> rctLookupTables;
+  std::unique_ptr<L1RCT> rct;
   bool useEcal;
   bool useHcal;
   std::vector<edm::InputTag> ecalDigis;
@@ -73,7 +74,7 @@ class L1RCTProducer : public edm::EDProducer {
   std::string conditionsLabel;
 
   // Create a channel mask object to be updated at every Run....
-  L1RCTChannelMask *fedUpdatedMask;
+  std::unique_ptr<L1RCTChannelMask> fedUpdatedMask;
 
   enum crateSection { c_min, ebOddFed = c_min, ebEvenFed, eeFed, hbheFed, hfFed, hfFedUp, c_max = hfFedUp };
 

diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc
@@ -32,7 +32,7 @@ const int L1RCTProducer::crateFED[18][6] = {{613, 614, 603, 702, 718, 1118},
 
 L1RCTProducer::L1RCTProducer(const edm::ParameterSet &conf)
     : rctLookupTables(new L1RCTLookupTables),
-      rct(new L1RCT(rctLookupTables)),
+      rct(new L1RCT(rctLookupTables.get())),
       useEcal(conf.getParameter<bool>("useEcal")),
       useHcal(conf.getParameter<bool>("useHcal")),
       ecalDigis(conf.getParameter<std::vector<edm::InputTag>>("ecalDigis")),
@@ -57,15 +57,6 @@ L1RCTProducer::L1RCTProducer(const edm::ParameterSet &conf)
   }
 }
 
-L1RCTProducer::~L1RCTProducer() {
-  if (rct != nullptr)
-    delete rct;
-  if (rctLookupTables != nullptr)
-    delete rctLookupTables;
-  if (fedUpdatedMask != nullptr)
-    delete fedUpdatedMask;
-}
-
 void L1RCTProducer::beginRun(edm::Run const &run, const edm::EventSetup &eventSetup) {
   //  std::cout << "getFedsFromOmds is " << getFedsFromOmds << std::endl;
 
@@ -156,10 +147,7 @@ void L1RCTProducer::updateFedVector(const edm::EventSetup &eventSetup,
   // This is the beginning of run. We delete the old
   // create the new and set it in the LUTs
 
-  if (fedUpdatedMask != nullptr)
-    delete fedUpdatedMask;
-
-  fedUpdatedMask = new L1RCTChannelMask();
+  fedUpdatedMask = std::make_unique<L1RCTChannelMask>();
   // copy a constant object
   for (int i = 0; i < 18; i++) {
     for (int j = 0; j < 2; j++) {
@@ -291,7 +279,7 @@ void L1RCTProducer::updateFedVector(const edm::EventSetup &eventSetup,
     }
   }
 
-  rctLookupTables->setChannelMask(fedUpdatedMask);
+  rctLookupTables->setChannelMask(fedUpdatedMask.get());
 }
 
 const std::vector<int> L1RCTProducer::getFedVectorFromRunInfo(const edm::EventSetup &eventSetup) {