Try to use one/EDAnalyzer in some testing codes of HCAL

cms-sw · Nov 2, 2021 · b5ab699 · b5ab699
1 parent 5ddd05b
commit b5ab699
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/DataFormats/HcalDigi/test/HcalDigiDump.cc b/DataFormats/HcalDigi/test/HcalDigiDump.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 "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
@@ -11,10 +11,11 @@ using namespace std;
       
 \author J. Mans - Minnesota
 */
-class HcalDigiDump : public edm::EDAnalyzer {
+class HcalDigiDump : public edm::one::EDAnalyzer<> {
 public:
   explicit HcalDigiDump(edm::ParameterSet const& conf);
-  virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
+  ~HcalDigiDump() override = default;
+  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
 };
 
 HcalDigiDump::HcalDigiDump(edm::ParameterSet const& conf) {

diff --git a/IORawData/HcalTBInputService/plugins/HcalTBWriter.h b/IORawData/HcalTBInputService/plugins/HcalTBWriter.h
@@ -3,11 +3,12 @@
 
 #include <map>
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#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 "DataFormats/Common/interface/Handle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "IORawData/HcalTBInputService/src/CDFRunInfo.h"
 
@@ -22,9 +23,10 @@ class CDFEventInfo;
   *
   * \author J. Mans - Minnesota
   */
-class HcalTBWriter : public edm::EDAnalyzer {
+class HcalTBWriter : public edm::one::EDAnalyzer<> {
 public:
-  HcalTBWriter(const edm::ParameterSet& pset);
+  explicit HcalTBWriter(const edm::ParameterSet& pset);
+  ~HcalTBWriter() override = default;
   void analyze(const edm::Event& e, const edm::EventSetup& es) override;
   void endJob() override;
 

diff --git a/RecoTBCalo/HcalPlotter/src/HcalQLPlotAnal.cc b/RecoTBCalo/HcalPlotter/src/HcalQLPlotAnal.cc
@@ -21,10 +21,9 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -37,10 +36,10 @@
 // class declaration
 //
 
-class HcalQLPlotAnal : public edm::EDAnalyzer {
+class HcalQLPlotAnal : public edm::one::EDAnalyzer<> {
 public:
   explicit HcalQLPlotAnal(const edm::ParameterSet&);
-  ~HcalQLPlotAnal() override;
+  ~HcalQLPlotAnal() override = default;
 
 private:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
@@ -89,11 +88,6 @@ HcalQLPlotAnal::HcalQLPlotAnal(const edm::ParameterSet& iConfig)
   tok_tb_ = consumes<HcalTBTriggerData>(iConfig.getUntrackedParameter<edm::InputTag>("hcalTrigTag"));
 }
 
-HcalQLPlotAnal::~HcalQLPlotAnal() {
-  // do anything here that needs to be done at destruction time
-  // (e.g. close files, deallocate resources etc.)
-}
-
 //
 // member functions
 //

diff --git a/TBDataFormats/HcalTBObjects/test/HcalTBObjectDump.cc b/TBDataFormats/HcalTBObjects/test/HcalTBObjectDump.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 "DataFormats/Common/interface/Handle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -20,10 +20,11 @@ namespace cms {
   $Revision: 1.8 $
   \author J. Mans - Minnesota
   */
-  class HcalTBObjectDump : public edm::EDAnalyzer {
+  class HcalTBObjectDump : public edm::one::EDAnalyzer<> {
   public:
     explicit HcalTBObjectDump(edm::ParameterSet const& conf);
-    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
+    ~HcalTBObjectDump() = default;
+    void analyze(edm::Event const& e, edm::EventSetup const& c) override;
 
   private:
     edm::EDGetTokenT<HcalTBTriggerData> tok_tb_;