Merge pull request #37124 from yuanchao/CMSSW_12_3_X

Migrate deprecated EDAnalyzers in CondTools/DT to the One version.
cms-sw · Mar 4, 2022 · 86ffc31 · 86ffc31
2 parents b6201e3 + d6ff5e2
commit 86ffc31
Show file tree

Hide file tree

Showing 37 changed files with 102 additions and 138 deletions.
diff --git a/CondTools/DT/test/stubs/DTCompactMapDump.cc b/CondTools/DT/test/stubs/DTCompactMapDump.cc
@@ -25,8 +25,6 @@ namespace edmtest {
 
   DTCompactMapDump::DTCompactMapDump(int i) {}
 
-  DTCompactMapDump::~DTCompactMapDump() {}
-
   void DTCompactMapDump::analyze(const edm::Event& e, const edm::EventSetup& context) {}
 
   void DTCompactMapDump::endJob() {

diff --git a/CondTools/DT/test/stubs/DTCompactMapDump.h b/CondTools/DT/test/stubs/DTCompactMapDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -14,13 +14,13 @@ Toy EDAnalyzer for testing purposes only.
 #include <string>
 
 namespace edmtest {
-  class DTCompactMapDump : public edm::EDAnalyzer {
+  class DTCompactMapDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTCompactMapDump(edm::ParameterSet const& p);
     explicit DTCompactMapDump(int i);
-    virtual ~DTCompactMapDump();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-    virtual void endJob();
+    ~DTCompactMapDump() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+    void endJob() override;
 
   private:
     std::string fileName;

diff --git a/CondTools/DT/test/stubs/DTFullMapDump.cc b/CondTools/DT/test/stubs/DTFullMapDump.cc
@@ -26,8 +26,6 @@ namespace edmtest {
 
   DTFullMapDump::DTFullMapDump(int i) {}
 
-  DTFullMapDump::~DTFullMapDump() {}
-
   void DTFullMapDump::analyze(const edm::Event& e, const edm::EventSetup& context) {}
 
   void DTFullMapDump::endJob() {

diff --git a/CondTools/DT/test/stubs/DTFullMapDump.h b/CondTools/DT/test/stubs/DTFullMapDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -14,13 +14,13 @@ Toy EDAnalyzer for testing purposes only.
 #include <string>
 
 namespace edmtest {
-  class DTFullMapDump : public edm::EDAnalyzer {
+  class DTFullMapDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTFullMapDump(edm::ParameterSet const& p);
     explicit DTFullMapDump(int i);
-    virtual ~DTFullMapDump();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-    virtual void endJob();
+    ~DTFullMapDump() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+    void endJob() override;
 
   private:
     std::string fileName;

diff --git a/CondTools/DT/test/stubs/DTGeometryDump.cc b/CondTools/DT/test/stubs/DTGeometryDump.cc
@@ -22,8 +22,6 @@ namespace edmtest {
 
   DTGeometryDump::DTGeometryDump(int i) : dtgeomToken_(esConsumes()) {}
 
-  DTGeometryDump::~DTGeometryDump() {}
-
   void DTGeometryDump::analyze(const edm::Event& e, const edm::EventSetup& context) {
     using namespace edm::eventsetup;
     auto muonGeom = context.getHandle(dtgeomToken_);

diff --git a/CondTools/DT/test/stubs/DTGeometryDump.h b/CondTools/DT/test/stubs/DTGeometryDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -16,12 +16,12 @@ class DTGeometry;
 class MuonGeometryRecord;
 
 namespace edmtest {
-  class DTGeometryDump : public edm::EDAnalyzer {
+  class DTGeometryDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTGeometryDump(edm::ParameterSet const& p);
     explicit DTGeometryDump(int i);
-    virtual ~DTGeometryDump();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
+    ~DTGeometryDump() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
   private:
     edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtgeomToken_;

diff --git a/CondTools/DT/test/stubs/DTHVDump.cc b/CondTools/DT/test/stubs/DTHVDump.cc
@@ -26,8 +26,6 @@ namespace edmtest {
 
   DTHVDump::DTHVDump(int i) : dthvstatusToken_(esConsumes()) {}
 
-  DTHVDump::~DTHVDump() {}
-
   void DTHVDump::analyze(const edm::Event& e, const edm::EventSetup& context) {
     using namespace edm::eventsetup;
     // Context is not used.

diff --git a/CondTools/DT/test/stubs/DTHVDump.h b/CondTools/DT/test/stubs/DTHVDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -15,12 +15,12 @@ Toy EDAnalyzer for testing purposes only.
 class DTHVStatus;
 class DTHVStatusRcd;
 namespace edmtest {
-  class DTHVDump : public edm::EDAnalyzer {
+  class DTHVDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTHVDump(edm::ParameterSet const& p);
     explicit DTHVDump(int i);
-    virtual ~DTHVDump();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
+    ~DTHVDump() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
   private:
     edm::ESGetToken<DTHVStatus, DTHVStatusRcd> dthvstatusToken_;

diff --git a/CondTools/DT/test/stubs/DTKeyedConfigDump.h b/CondTools/DT/test/stubs/DTKeyedConfigDump.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -21,7 +21,7 @@ Toy EDAnalyzer for testing purposes only.
 #include <string>
 
 namespace edmtest {
-  class DTKeyedConfigDump : public edm::EDAnalyzer {
+  class DTKeyedConfigDump : public edm::one::EDAnalyzer<> {
   public:
     explicit DTKeyedConfigDump(edm::ParameterSet const& p);
 

diff --git a/CondTools/DT/test/stubs/DTTimeUtility.cc b/CondTools/DT/test/stubs/DTTimeUtility.cc
@@ -35,8 +35,6 @@ namespace edmtest {
 
   DTTimeUtility::DTTimeUtility(int i) {}
 
-  DTTimeUtility::~DTTimeUtility() {}
-
   void DTTimeUtility::analyze(const edm::Event& e, const edm::EventSetup& context) {
     //    using namespace edm::eventsetup;
     long long int condConv = ((((condTime >> 32) & 0xFFFFFFFF) * 1000000000) + ((condTime & 0xFFFFFFFF) * 1000));

diff --git a/CondTools/DT/test/stubs/DTTimeUtility.h b/CondTools/DT/test/stubs/DTTimeUtility.h
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -14,12 +14,12 @@ Toy EDAnalyzer for testing purposes only.
 #include <string>
 
 namespace edmtest {
-  class DTTimeUtility : public edm::EDAnalyzer {
+  class DTTimeUtility : public edm::one::EDAnalyzer<> {
   public:
     explicit DTTimeUtility(edm::ParameterSet const& p);
     explicit DTTimeUtility(int i);
-    virtual ~DTTimeUtility();
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
+    ~DTTimeUtility() override = default;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
   private:
     int year;

diff --git a/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.cc b/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTCCBConfigValidateDBRead::DTCCBConfigValidateDBRead(edm::ParameterSet const& p)
 
 DTCCBConfigValidateDBRead::DTCCBConfigValidateDBRead(int i) : dtccbToken_(esConsumes()) {}
 
-DTCCBConfigValidateDBRead::~DTCCBConfigValidateDBRead() {}
-
 void DTCCBConfigValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.

diff --git a/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.h b/CondTools/DT/test/validate/DTCCBConfigValidateDBRead.h
@@ -4,21 +4,21 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 class DTConfigKey;
 class DTCCBConfig;
 class DTCCBConfigRcd;
-class DTCCBConfigValidateDBRead : public edm::EDAnalyzer {
+class DTCCBConfigValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTCCBConfigValidateDBRead(edm::ParameterSet const& p);
   explicit DTCCBConfigValidateDBRead(int i);
-  virtual ~DTCCBConfigValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTCCBConfigValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;

diff --git a/CondTools/DT/test/validate/DTCompMapValidateDBRead.cc b/CondTools/DT/test/validate/DTCompMapValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTCompMapValidateDBRead::DTCompMapValidateDBRead(edm::ParameterSet const& p)
 
 DTCompMapValidateDBRead::DTCompMapValidateDBRead(int i) : dtreadoutmappingToken_(esConsumes()) {}
 
-DTCompMapValidateDBRead::~DTCompMapValidateDBRead() {}
-
 void DTCompMapValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.

diff --git a/CondTools/DT/test/validate/DTCompMapValidateDBRead.h b/CondTools/DT/test/validate/DTCompMapValidateDBRead.h
@@ -5,21 +5,21 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class DTReadOutMapping;
 class DTReadOutMappingRcd;
-class DTCompMapValidateDBRead : public edm::EDAnalyzer {
+class DTCompMapValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTCompMapValidateDBRead(edm::ParameterSet const& p);
   explicit DTCompMapValidateDBRead(int i);
-  virtual ~DTCompMapValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTCompMapValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;

diff --git a/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.cc b/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTDeadFlagValidateDBRead::DTDeadFlagValidateDBRead(edm::ParameterSet const& p)
 
 DTDeadFlagValidateDBRead::DTDeadFlagValidateDBRead(int i) : dtdeadflagToken_(esConsumes()) {}
 
-DTDeadFlagValidateDBRead::~DTDeadFlagValidateDBRead() {}
-
 void DTDeadFlagValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.

diff --git a/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.h b/CondTools/DT/test/validate/DTDeadFlagValidateDBRead.h
@@ -5,20 +5,20 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 class DTDeadFlag;
 class DTDeadFlagRcd;
-class DTDeadFlagValidateDBRead : public edm::EDAnalyzer {
+class DTDeadFlagValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTDeadFlagValidateDBRead(edm::ParameterSet const& p);
   explicit DTDeadFlagValidateDBRead(int i);
-  virtual ~DTDeadFlagValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTDeadFlagValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;

diff --git a/CondTools/DT/test/validate/DTHVStatusValidateDBRead.cc b/CondTools/DT/test/validate/DTHVStatusValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTHVStatusValidateDBRead::DTHVStatusValidateDBRead(edm::ParameterSet const& p)
 
 DTHVStatusValidateDBRead::DTHVStatusValidateDBRead(int i) : dthvstatusToken_(esConsumes()) {}
 
-DTHVStatusValidateDBRead::~DTHVStatusValidateDBRead() {}
-
 void DTHVStatusValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.

diff --git a/CondTools/DT/test/validate/DTHVStatusValidateDBRead.h b/CondTools/DT/test/validate/DTHVStatusValidateDBRead.h
@@ -5,20 +5,20 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 class DTHVStatus;
 class DTHVStatusRcd;
-class DTHVStatusValidateDBRead : public edm::EDAnalyzer {
+class DTHVStatusValidateDBRead : public edm::one::EDAnalyzer<> {
 public:
   explicit DTHVStatusValidateDBRead(edm::ParameterSet const& p);
   explicit DTHVStatusValidateDBRead(int i);
-  virtual ~DTHVStatusValidateDBRead();
-  virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
-  virtual void endJob();
+  ~DTHVStatusValidateDBRead() override = default;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void endJob() override;
 
 private:
   std::string dataFileName;

diff --git a/CondTools/DT/test/validate/DTLVStatusValidateDBRead.cc b/CondTools/DT/test/validate/DTLVStatusValidateDBRead.cc
@@ -5,7 +5,7 @@ Toy EDAnalyzer for testing purposes only.
 
 ----------------------------------------------------------------------*/
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -31,8 +31,6 @@ DTLVStatusValidateDBRead::DTLVStatusValidateDBRead(edm::ParameterSet const& p)
 
 DTLVStatusValidateDBRead::DTLVStatusValidateDBRead(int i) : dtlvstatusToken_(esConsumes()) {}
 
-DTLVStatusValidateDBRead::~DTLVStatusValidateDBRead() {}
-
 void DTLVStatusValidateDBRead::analyze(const edm::Event& e, const edm::EventSetup& context) {
   using namespace edm::eventsetup;
   // Context is not used.