Fixe deprecation warnings in L1TriggerConfig/RCTConfigProducers

- converted modules to thread-friendly types - added EventSetup consumes
cms-sw · Oct 17, 2022 · 0c2178e · 0c2178e
1 parent 816ed4f
commit 0c2178e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/L1TriggerConfig/RCTConfigProducers/src/L1RCTChannelMaskTester.cc b/L1TriggerConfig/RCTConfigProducers/src/L1RCTChannelMaskTester.cc
@@ -17,7 +17,7 @@
 //
 #include <iostream>
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -39,25 +39,22 @@
 // class declaration
 //
 
-class L1RCTChannelMaskTester : public edm::EDAnalyzer {
+class L1RCTChannelMaskTester : public edm::one::EDAnalyzer<> {
 public:
-  explicit L1RCTChannelMaskTester(const edm::ParameterSet&) {}
-  ~L1RCTChannelMaskTester() override {}
+  explicit L1RCTChannelMaskTester(const edm::ParameterSet&) : maskToken_(esConsumes()), noisyToken_(esConsumes()) {}
   void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+private:
+  edm::ESGetToken<L1RCTChannelMask, L1RCTChannelMaskRcd> maskToken_;
+  edm::ESGetToken<L1RCTNoisyChannelMask, L1RCTNoisyChannelMaskRcd> noisyToken_;
 };
 
 void L1RCTChannelMaskTester::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup) {
   //
-  edm::ESHandle<L1RCTChannelMask> rctChanMask;
-  evSetup.get<L1RCTChannelMaskRcd>().get(rctChanMask);
-
-  rctChanMask->print(std::cout);
+  evSetup.getData(maskToken_).print(std::cout);
 
   if (auto maskRecord = evSetup.tryToGet<L1RCTNoisyChannelMaskRcd>()) {
-    edm::ESHandle<L1RCTNoisyChannelMask> rctNoisyChanMask;
-    maskRecord->get(rctNoisyChanMask);
-
-    rctNoisyChanMask->print(std::cout);
+    maskRecord->get(noisyToken_).print(std::cout);
   } else {
     std::cout << "\nRecord \""
               << "L1RCTNoisyChannelMaskRcd"

diff --git a/L1TriggerConfig/RCTConfigProducers/src/L1RCTOmdsFedVectorProducer.cc b/L1TriggerConfig/RCTConfigProducers/src/L1RCTOmdsFedVectorProducer.cc
@@ -64,6 +64,8 @@ class L1RCTOmdsFedVectorProducer : public edm::ESProducer {
   std::string connectionString;
   std::string authpath;
   std::string tableToRead;
+
+  edm::ESGetToken<RunInfo, RunInfoRcd> token_;
 };
 
 //
@@ -83,7 +85,7 @@ L1RCTOmdsFedVectorProducer::L1RCTOmdsFedVectorProducer(const edm::ParameterSet&
       tableToRead(iConfig.getParameter<std::string>("tableToRead")) {
   //the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this, "OmdsFedVector");
+  token_ = setWhatProduced(this, "OmdsFedVector").consumes();
 
   //now do what ever other initialization is needed
 }
@@ -104,9 +106,7 @@ L1RCTOmdsFedVectorProducer::ReturnType L1RCTOmdsFedVectorProducer::produce(const
   //  std::cout << "GETTING FED VECTOR FROM OMDS" << std::endl;
 
   // GETTING ALREADY-EXISTING RUNINFO OUT OF ES TO FIND OUT RUN NUMBER
-  edm::ESHandle<RunInfo> sum;
-  iRecord.get(sum);
-  const RunInfo* summary = sum.product();
+  const RunInfo* summary = &iRecord.get(token_);
   int runNumber = summary->m_run;
 
   // CREATING NEW RUNINFO WHICH WILL GET NEW FED VECTOR AND BE RETURNED

diff --git a/L1TriggerConfig/RCTConfigProducers/src/L1RCTParametersTester.cc b/L1TriggerConfig/RCTConfigProducers/src/L1RCTParametersTester.cc
@@ -16,7 +16,7 @@
 //
 //
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -42,18 +42,17 @@ using std::endl;
 // class declaration
 //
 
-class L1RCTParametersTester : public edm::EDAnalyzer {
+class L1RCTParametersTester : public edm::one::EDAnalyzer<> {
 public:
-  explicit L1RCTParametersTester(const edm::ParameterSet&) {}
-  ~L1RCTParametersTester() override {}
+  explicit L1RCTParametersTester(const edm::ParameterSet&) : token_(esConsumes()) {}
   void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+private:
+  edm::ESGetToken<L1RCTParameters, L1RCTParametersRcd> token_;
 };
 
 void L1RCTParametersTester::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup) {
-  edm::ESHandle<L1RCTParameters> rctParam;
-  evSetup.get<L1RCTParametersRcd>().get(rctParam);
-
-  rctParam->print(std::cout);
+  evSetup.getData(token_).print(std::cout);
 }
 
 DEFINE_FWK_MODULE(L1RCTParametersTester);