Avoid compilation warnings in some of the codes of Validation/RecoTau

cms-sw · Dec 28, 2021 · ac80bd8 · ac80bd8
1 parent 182d129
commit ac80bd8
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/Validation/RecoTau/interface/TauTagValidation.h b/Validation/RecoTau/interface/TauTagValidation.h
@@ -17,7 +17,6 @@
 // user include files
 
 #include "FWCore/Common/interface/Provenance.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/Validation/RecoTau/interface/TauValidationMiniAOD.h b/Validation/RecoTau/interface/TauValidationMiniAOD.h
@@ -15,7 +15,6 @@
 // Original Author: Aniello Spiezia On August 13, 2019
 // user include files
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/Validation/RecoTau/plugins/DQMFileLoader.h b/Validation/RecoTau/plugins/DQMFileLoader.h
@@ -9,7 +9,7 @@
  */
 
 // framework & common header files
-#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"
@@ -21,7 +21,7 @@
 #include <vector>
 #include <string>
 
-class TauDQMFileLoader : public edm::EDAnalyzer {
+class TauDQMFileLoader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   typedef dqm::legacy::DQMStore DQMStore;
   typedef dqm::legacy::MonitorElement MonitorElement;
 
@@ -42,6 +42,7 @@ class TauDQMFileLoader : public edm::EDAnalyzer {
   ~TauDQMFileLoader() override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
   void endJob() override {}
+  void beginRun(edm::Run const&, edm::EventSetup const&) override {}
   void endRun(const edm::Run& r, const edm::EventSetup& c) override;
 
 private:

diff --git a/Validation/RecoTau/plugins/DQMHistEffProducer.h b/Validation/RecoTau/plugins/DQMHistEffProducer.h
@@ -9,7 +9,6 @@
  */
 
 // framework & common header files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/Validation/RecoTau/plugins/DQMHistNormalizer.cc b/Validation/RecoTau/plugins/DQMHistNormalizer.cc
@@ -6,7 +6,7 @@
  */
 
 // framework & common header files
-#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/Framework/interface/MakerMacros.h"
@@ -27,14 +27,15 @@
 
 using namespace std;
 
-class DQMHistNormalizer : public edm::EDAnalyzer {
+class DQMHistNormalizer : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 public:
   typedef dqm::legacy::DQMStore DQMStore;
   typedef dqm::legacy::MonitorElement MonitorElement;
 
   explicit DQMHistNormalizer(const edm::ParameterSet&);
   ~DQMHistNormalizer() override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void beginRun(const edm::Run&, const edm::EventSetup&) override {}
   void endRun(const edm::Run& r, const edm::EventSetup& c) override;
 
 private:

diff --git a/Validation/RecoTau/plugins/DQMHistPlotter.h b/Validation/RecoTau/plugins/DQMHistPlotter.h
@@ -9,7 +9,7 @@
  */
 
 // framework & common header files
-#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"
@@ -24,7 +24,7 @@
 #include <vector>
 #include <map>
 
-class TauDQMHistPlotter : public edm::EDAnalyzer {
+class TauDQMHistPlotter : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   typedef dqm::legacy::DQMStore DQMStore;
   typedef dqm::legacy::MonitorElement MonitorElement;
 
@@ -157,6 +157,7 @@ class TauDQMHistPlotter : public edm::EDAnalyzer {
   explicit TauDQMHistPlotter(const edm::ParameterSet&);
   ~TauDQMHistPlotter() override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void beginRun(edm::Run const&, edm::EventSetup const&) override {}
   void endRun(const edm::Run& r, const edm::EventSetup& c) override;
 
 private:

diff --git a/Validation/RecoTau/plugins/DQMSimpleFileSaver.h b/Validation/RecoTau/plugins/DQMSimpleFileSaver.h
@@ -10,7 +10,7 @@
  */
 
 // framework & common header files
-#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"
@@ -19,7 +19,7 @@
 
 #include <string>
 
-class TauDQMSimpleFileSaver : public edm::EDAnalyzer {
+class TauDQMSimpleFileSaver : public edm::one::EDAnalyzer<> {
 public:
   typedef dqm::legacy::DQMStore DQMStore;
   typedef dqm::legacy::MonitorElement MonitorElement;