modernize AlcaBeamSpotHarvester and PCLMetadataWriter

cms-sw · Dec 15, 2020 · 5bb0c87 · 5bb0c87
1 parent 65cdaec
commit 5bb0c87
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 29 deletions.
diff --git a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h
@@ -7,28 +7,26 @@
  *  \author L. Uplegger F. Yumiceva - Fermilab
  */
 #include "Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "RecoVertex/BeamSpotProducer/interface/BeamSpotWrite2Txt.h"
 
 // #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class AlcaBeamSpotHarvester : public edm::EDAnalyzer {
+class AlcaBeamSpotHarvester : public edm::one::EDAnalyzer<> {
 public:
   /// Constructor
   AlcaBeamSpotHarvester(const edm::ParameterSet &);
 
   /// Destructor
-  ~AlcaBeamSpotHarvester() override;
+  ~AlcaBeamSpotHarvester() override = default;
 
   // Operations
-  void beginJob(void) override;
-  void endJob(void) override;
   void analyze(const edm::Event &, const edm::EventSetup &) override;
-  void beginRun(const edm::Run &, const edm::EventSetup &) override;
-  void endRun(const edm::Run &, const edm::EventSetup &) override;
-  void beginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
-  void endLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &);
+  void endRun(const edm::Run &, const edm::EventSetup &);
+  void beginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &);
+  void endLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &);
 
 protected:
 private:

diff --git a/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc b/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc
@@ -50,15 +50,6 @@ AlcaBeamSpotHarvester::AlcaBeamSpotHarvester(const edm::ParameterSet &iConfig)
                           .getUntrackedParameter<std::string>("TxtFileName")),
       theAlcaBeamSpotManager_(iConfig, consumesCollector()) {}
 
-//--------------------------------------------------------------------------------------------------
-AlcaBeamSpotHarvester::~AlcaBeamSpotHarvester() {}
-
-//--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotHarvester::beginJob() {}
-
-//--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotHarvester::endJob() {}
-
 //--------------------------------------------------------------------------------------------------
 void AlcaBeamSpotHarvester::analyze(const edm::Event &iEvent, const edm::EventSetup &) {
   //  edm::LogInfo("AlcaBeamSpotHarvester")

diff --git a/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.cc b/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.cc
@@ -7,7 +7,7 @@
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/Common/interface/DropBoxMetadata.h"
 #include "CondFormats/DataRecord/interface/DropBoxMetadataRcd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
@@ -18,23 +18,18 @@
 #include <vector>
 #include <iostream>
 
-class PCLMetadataWriter : public edm::EDAnalyzer {
+class PCLMetadataWriter : public edm::one::EDAnalyzer<> {
 public:
   /// Constructor
   PCLMetadataWriter(const edm::ParameterSet &);
 
   /// Destructor
-  ~PCLMetadataWriter() override;
+  ~PCLMetadataWriter() override = default;
 
   // Operations
-  //   virtual void beginJob            (void);
-  //   virtual void endJob              (void);
   void analyze(const edm::Event &, const edm::EventSetup &) override;
-  void beginRun(const edm::Run &, const edm::EventSetup &) override;
-  void endRun(const edm::Run &, const edm::EventSetup &) override;
-  //   virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const
-  //   edm::EventSetup&); virtual void endLuminosityBlock  (const
-  //   edm::LuminosityBlock&, const edm::EventSetup&);
+  void beginRun(const edm::Run &, const edm::EventSetup &);
+  void endRun(const edm::Run &, const edm::EventSetup &);
 
 protected:
 private:
@@ -73,7 +68,7 @@ PCLMetadataWriter::PCLMetadataWriter(const edm::ParameterSet &pSet)
   }
 }
 
-PCLMetadataWriter::~PCLMetadataWriter() {}
+//PCLMetadataWriter::~PCLMetadataWriter() {}
 
 void PCLMetadataWriter::analyze(const edm::Event &event, const edm::EventSetup &eSetup) {}