Remove CMS deprecated warnings from L1Trigger/ConfigUtilities

- changed to thread-friendly module types - added esConsumes
forthommel · May 26, 2022 · 11b322b · 11b322b
1 parent db601ef
commit 11b322b
Show file tree

Hide file tree

Showing 19 changed files with 308 additions and 289 deletions.
diff --git a/L1TriggerConfig/Utilities/src/L1KeyListWriter.cc b/L1TriggerConfig/Utilities/src/L1KeyListWriter.cc
@@ -1,7 +1,7 @@
 #include <iomanip>
 #include <iostream>
 
-#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"
@@ -15,23 +15,23 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 
-class L1KeyListWriter : public edm::EDAnalyzer {
+class L1KeyListWriter : public edm::one::EDAnalyzer<> {
 public:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
-  explicit L1KeyListWriter(const edm::ParameterSet&) : edm::EDAnalyzer() {}
-  ~L1KeyListWriter(void) override {}
+  explicit L1KeyListWriter(const edm::ParameterSet&) : token_{esConsumes()} {}
+
+private:
+  edm::ESGetToken<L1TriggerKeyListExt, L1TriggerKeyListExtRcd> token_;
 };
 
 void L1KeyListWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup) {
-  edm::ESHandle<L1TriggerKeyListExt> handle1;
-  evSetup.get<L1TriggerKeyListExtRcd>().get(handle1);
-  std::shared_ptr<L1TriggerKeyListExt> ptr1(new L1TriggerKeyListExt(*(handle1.product())));
+  L1TriggerKeyListExt const& ptr1 = evSetup.getData(token_);
 
   edm::Service<cond::service::PoolDBOutputService> poolDb;
   if (poolDb.isAvailable()) {
     cond::Time_t firstSinceTime = poolDb->beginOfTime();
-    poolDb->writeOneIOV(*ptr1, firstSinceTime, "L1TriggerKeyListExtRcd");
+    poolDb->writeOneIOV(ptr1, firstSinceTime, "L1TriggerKeyListExtRcd");
   }
 }
 

diff --git a/L1TriggerConfig/Utilities/src/L1KeyWriter.cc b/L1TriggerConfig/Utilities/src/L1KeyWriter.cc
@@ -1,7 +1,7 @@
 #include <iomanip>
 #include <iostream>
 
-#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"
@@ -15,23 +15,23 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 
-class L1KeyWriter : public edm::EDAnalyzer {
+class L1KeyWriter : public edm::one::EDAnalyzer<> {
 public:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
-  explicit L1KeyWriter(const edm::ParameterSet&) : edm::EDAnalyzer() {}
-  ~L1KeyWriter(void) override {}
+  explicit L1KeyWriter(const edm::ParameterSet&) : token_{esConsumes()} {}
+
+private:
+  edm::ESGetToken<L1TriggerKeyExt, L1TriggerKeyExtRcd> token_;
 };
 
 void L1KeyWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup) {
-  edm::ESHandle<L1TriggerKeyExt> handle1;
-  evSetup.get<L1TriggerKeyExtRcd>().get(handle1);
-  std::shared_ptr<L1TriggerKeyExt> ptr1(new L1TriggerKeyExt(*(handle1.product())));
+  L1TriggerKeyExt const& ptr1 = evSetup.getData(token_);
 
   edm::Service<cond::service::PoolDBOutputService> poolDb;
   if (poolDb.isAvailable()) {
     cond::Time_t firstSinceTime = poolDb->beginOfTime();
-    poolDb->writeOneIOV(*ptr1, firstSinceTime, "L1TriggerKeyExtRcd");
+    poolDb->writeOneIOV(ptr1, firstSinceTime, "L1TriggerKeyExtRcd");
   }
 }
 

diff --git a/L1TriggerConfig/Utilities/src/L1TCaloParamsUpdater.cc b/L1TriggerConfig/Utilities/src/L1TCaloParamsUpdater.cc
@@ -2,7 +2,7 @@
 #include <fstream>
 #include <iostream>
 
-#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"
 
@@ -16,19 +16,18 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 
-class L1TCaloParamsUpdater : public edm::EDAnalyzer {
+class L1TCaloParamsUpdater : public edm::one::EDAnalyzer<> {
 public:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
-  explicit L1TCaloParamsUpdater(const edm::ParameterSet&) : edm::EDAnalyzer() {}
-  ~L1TCaloParamsUpdater(void) override {}
+  explicit L1TCaloParamsUpdater(const edm::ParameterSet&) : token_{esConsumes()} {}
+
+private:
+  edm::ESGetToken<l1t::CaloParams, L1TCaloStage2ParamsRcd> token_;
 };
 
 void L1TCaloParamsUpdater::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup) {
-  edm::ESHandle<l1t::CaloParams> handle1;
-  //    evSetup.get<L1TCaloParamsRcd>().get( "l1conddb", handle1 ) ;
-  evSetup.get<L1TCaloStage2ParamsRcd>().get(handle1);
-  l1t::CaloParamsHelper m_params_helper(*(handle1.product()));
+  l1t::CaloParamsHelper m_params_helper(evSetup.getData(token_));
 
   //    std::ifstream is("tauL1CalibLUT_V2.txt");
   //    l1t::LUT lut;

diff --git a/L1TriggerConfig/Utilities/src/L1TCaloParamsViewer.cc b/L1TriggerConfig/Utilities/src/L1TCaloParamsViewer.cc
@@ -1,4 +1,4 @@
-#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"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -12,8 +12,10 @@
 #include "L1Trigger/L1TCalorimeter/interface/CaloParamsHelper.h"
 #include <iomanip>
 
-class L1TCaloParamsViewer : public edm::EDAnalyzer {
+class L1TCaloParamsViewer : public edm::one::EDAnalyzer<> {
 private:
+  edm::ESGetToken<l1t::CaloParams, L1TCaloStage2ParamsRcd> stage2ParamsToken_;
+  edm::ESGetToken<l1t::CaloParams, L1TCaloParamsRcd> paramsToken_;
   bool printPUSParams;
   bool printTauCalibLUT;
   bool printTauCompressLUT;
@@ -44,7 +46,7 @@ class L1TCaloParamsViewer : public edm::EDAnalyzer {
 public:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
-  explicit L1TCaloParamsViewer(const edm::ParameterSet& pset) : edm::EDAnalyzer() {
+  explicit L1TCaloParamsViewer(const edm::ParameterSet& pset) {
     printPUSParams = pset.getUntrackedParameter<bool>("printPUSParams", false);
     printTauCalibLUT = pset.getUntrackedParameter<bool>("printTauCalibLUT", false);
     printTauCompressLUT = pset.getUntrackedParameter<bool>("printTauCompressLUT", false);
@@ -67,6 +69,11 @@ class L1TCaloParamsViewer : public edm::EDAnalyzer {
     printEtSumEcalSumCalibrationLUT = pset.getUntrackedParameter<bool>("printEtSumEcalSumCalibrationLUT", false);
 
     useStage2Rcd = pset.getUntrackedParameter<bool>("useStage2Rcd", false);
+
+    if (useStage2Rcd)
+      stage2ParamsToken_ = esConsumes();
+    else
+      paramsToken_ = esConsumes();
   }
 
   ~L1TCaloParamsViewer(void) override {}
@@ -108,14 +115,14 @@ std::string L1TCaloParamsViewer::hash(void* buf, size_t len) const {
 void L1TCaloParamsViewer::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup) {
   edm::ESHandle<l1t::CaloParams> handle1;
   if (useStage2Rcd)
-    evSetup.get<L1TCaloStage2ParamsRcd>().get(handle1);
+    handle1 = evSetup.getHandle(stage2ParamsToken_);
   else
-    evSetup.get<L1TCaloParamsRcd>().get(handle1);
+    handle1 = evSetup.getHandle(paramsToken_);
 
-  std::shared_ptr<l1t::CaloParams> ptr(new l1t::CaloParams(*(handle1.product())));
+  l1t::CaloParams const& ptr = *handle1;
 
-  l1t::CaloParamsHelper* ptr1 = nullptr;
-  ptr1 = (l1t::CaloParamsHelper*)(&(*ptr));
+  l1t::CaloParamsHelper const* ptr1 = nullptr;
+  ptr1 = (l1t::CaloParamsHelper const*)(&(ptr));
 
   edm::LogInfo("") << "L1TCaloParamsViewer:";
 

diff --git a/L1TriggerConfig/Utilities/src/L1TCaloParamsWriter.cc b/L1TriggerConfig/Utilities/src/L1TCaloParamsWriter.cc
@@ -1,7 +1,7 @@
 #include <iomanip>
 #include <iostream>
 
-#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"
 
@@ -15,15 +15,22 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 
-class L1TCaloStage2ParamsWriter : public edm::EDAnalyzer {
+class L1TCaloStage2ParamsWriter : public edm::one::EDAnalyzer<> {
 private:
+  edm::ESGetToken<l1t::CaloParams, L1TCaloParamsO2ORcd> o2oParamsToken_;
+  edm::ESGetToken<l1t::CaloParams, L1TCaloParamsRcd> paramsToken_;
   bool isO2Opayload;
 
 public:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
-  explicit L1TCaloStage2ParamsWriter(const edm::ParameterSet& pset) : edm::EDAnalyzer() {
+  explicit L1TCaloStage2ParamsWriter(const edm::ParameterSet& pset) {
     isO2Opayload = pset.getUntrackedParameter<bool>("isO2Opayload", false);
+    if (isO2Opayload) {
+      o2oParamsToken_ = esConsumes();
+    } else {
+      paramsToken_ = esConsumes();
+    }
   }
   ~L1TCaloStage2ParamsWriter(void) override {}
 };
@@ -32,16 +39,14 @@ void L1TCaloStage2ParamsWriter::analyze(const edm::Event& iEvent, const edm::Eve
   edm::ESHandle<l1t::CaloParams> handle1;
 
   if (isO2Opayload)
-    evSetup.get<L1TCaloParamsO2ORcd>().get(handle1);
+    handle1 = evSetup.getHandle(o2oParamsToken_);
   else
-    evSetup.get<L1TCaloParamsRcd>().get(handle1);
-
-  std::shared_ptr<l1t::CaloParams> ptr1(new l1t::CaloParams(*(handle1.product())));
+    handle1 = evSetup.getHandle(paramsToken_);
 
   edm::Service<cond::service::PoolDBOutputService> poolDb;
   if (poolDb.isAvailable()) {
     cond::Time_t firstSinceTime = poolDb->beginOfTime();
-    poolDb->writeOneIOV(*ptr1, firstSinceTime, (isO2Opayload ? "L1TCaloParamsO2ORcd" : "L1TCaloParamsRcd"));
+    poolDb->writeOneIOV(*handle1, firstSinceTime, (isO2Opayload ? "L1TCaloParamsO2ORcd" : "L1TCaloParamsRcd"));
   }
 }