From ac80bd8402261f6d0633bb5abbd23b00da75caa5 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Tue, 28 Dec 2021 18:22:22 +0100 Subject: [PATCH 1/3] Avoid compilation warnings in some of the codes of Validation/RecoTau --- Validation/RecoTau/interface/TauTagValidation.h | 1 - Validation/RecoTau/interface/TauValidationMiniAOD.h | 1 - Validation/RecoTau/plugins/DQMFileLoader.h | 5 +++-- Validation/RecoTau/plugins/DQMHistEffProducer.h | 1 - Validation/RecoTau/plugins/DQMHistNormalizer.cc | 5 +++-- Validation/RecoTau/plugins/DQMHistPlotter.h | 5 +++-- Validation/RecoTau/plugins/DQMSimpleFileSaver.h | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Validation/RecoTau/interface/TauTagValidation.h b/Validation/RecoTau/interface/TauTagValidation.h index f42c52a479136..b11993a70e573 100644 --- 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 index 6da18c559771a..ebfbda4f8cf1d 100644 --- 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 index 854c0832b064c..284c6001275cc 100644 --- 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 #include -class TauDQMFileLoader : public edm::EDAnalyzer { +class TauDQMFileLoader : public edm::one::EDAnalyzer { 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 index daad47e020d43..d342d079ba186 100644 --- 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 index c6ba34f46ecae..b5ef67beb5289 100644 --- 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,7 +27,7 @@ using namespace std; -class DQMHistNormalizer : public edm::EDAnalyzer { +class DQMHistNormalizer : public edm::one::EDAnalyzer { public: typedef dqm::legacy::DQMStore DQMStore; typedef dqm::legacy::MonitorElement MonitorElement; @@ -35,6 +35,7 @@ class DQMHistNormalizer : public edm::EDAnalyzer { 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 index 1804c143371d2..dd7cccfb1578e 100644 --- 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 #include -class TauDQMHistPlotter : public edm::EDAnalyzer { +class TauDQMHistPlotter : public edm::one::EDAnalyzer { 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 index df8c0f05acead..a2437e6826dcb 100644 --- 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 -class TauDQMSimpleFileSaver : public edm::EDAnalyzer { +class TauDQMSimpleFileSaver : public edm::one::EDAnalyzer<> { public: typedef dqm::legacy::DQMStore DQMStore; typedef dqm::legacy::MonitorElement MonitorElement; From 1ddead7c58bd422efa02fd8f45b182026e06b739 Mon Sep 17 00:00:00 2001 From: Sunanda Banerjee Date: Tue, 4 Jan 2022 15:41:12 +0100 Subject: [PATCH 2/3] Restore legacy code for DQMFileLoader.h --- Validation/RecoTau/plugins/DQMFileLoader.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Validation/RecoTau/plugins/DQMFileLoader.h b/Validation/RecoTau/plugins/DQMFileLoader.h index 284c6001275cc..854c0832b064c 100644 --- a/Validation/RecoTau/plugins/DQMFileLoader.h +++ b/Validation/RecoTau/plugins/DQMFileLoader.h @@ -9,7 +9,7 @@ */ // framework & common header files -#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/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 #include -class TauDQMFileLoader : public edm::one::EDAnalyzer { +class TauDQMFileLoader : public edm::EDAnalyzer { typedef dqm::legacy::DQMStore DQMStore; typedef dqm::legacy::MonitorElement MonitorElement; @@ -42,7 +42,6 @@ class TauDQMFileLoader : public edm::one::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: From 8f13cf7966ce0c9b21f28045dcb21abd1b6847d1 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Tue, 4 Jan 2022 18:23:43 +0100 Subject: [PATCH 3/3] Restore also the files utilizing DQMStore --- Validation/RecoTau/plugins/DQMHistNormalizer.cc | 5 ++--- Validation/RecoTau/plugins/DQMHistPlotter.h | 5 ++--- Validation/RecoTau/plugins/DQMSimpleFileSaver.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Validation/RecoTau/plugins/DQMHistNormalizer.cc b/Validation/RecoTau/plugins/DQMHistNormalizer.cc index b5ef67beb5289..c6ba34f46ecae 100644 --- a/Validation/RecoTau/plugins/DQMHistNormalizer.cc +++ b/Validation/RecoTau/plugins/DQMHistNormalizer.cc @@ -6,7 +6,7 @@ */ // framework & common header files -#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -27,7 +27,7 @@ using namespace std; -class DQMHistNormalizer : public edm::one::EDAnalyzer { +class DQMHistNormalizer : public edm::EDAnalyzer { public: typedef dqm::legacy::DQMStore DQMStore; typedef dqm::legacy::MonitorElement MonitorElement; @@ -35,7 +35,6 @@ class DQMHistNormalizer : public edm::one::EDAnalyzer { 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 index dd7cccfb1578e..1804c143371d2 100644 --- a/Validation/RecoTau/plugins/DQMHistPlotter.h +++ b/Validation/RecoTau/plugins/DQMHistPlotter.h @@ -9,7 +9,7 @@ */ // framework & common header files -#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/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 #include -class TauDQMHistPlotter : public edm::one::EDAnalyzer { +class TauDQMHistPlotter : public edm::EDAnalyzer { typedef dqm::legacy::DQMStore DQMStore; typedef dqm::legacy::MonitorElement MonitorElement; @@ -157,7 +157,6 @@ class TauDQMHistPlotter : public edm::one::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 index a2437e6826dcb..df8c0f05acead 100644 --- a/Validation/RecoTau/plugins/DQMSimpleFileSaver.h +++ b/Validation/RecoTau/plugins/DQMSimpleFileSaver.h @@ -10,7 +10,7 @@ */ // framework & common header files -#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/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 -class TauDQMSimpleFileSaver : public edm::one::EDAnalyzer<> { +class TauDQMSimpleFileSaver : public edm::EDAnalyzer { public: typedef dqm::legacy::DQMStore DQMStore; typedef dqm::legacy::MonitorElement MonitorElement;