Merge pull request #36594 from bsunanda/Run3-gex109B

Run3-gex109B Avoid compilation warnings in some Validation code
cms-sw · Jan 5, 2022 · 828f9c4 · 828f9c4
2 parents 14862df + a2680a9
commit 828f9c4
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h
@@ -8,7 +8,6 @@
  *
  */
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"

diff --git a/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h
@@ -8,7 +8,6 @@
  *
  */
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"

diff --git a/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h
@@ -8,7 +8,6 @@
  *
  */
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"

diff --git a/Validation/EcalRecHits/interface/EcalRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalRecHitsValidation.h
@@ -8,7 +8,6 @@
  *
  */
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"

diff --git a/Validation/EcalRecHits/interface/EcalTBValidation.h b/Validation/EcalRecHits/interface/EcalTBValidation.h
@@ -4,7 +4,6 @@
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"

diff --git a/Validation/EcalTriggerPrimitives/src/TPGCheck.cc b/Validation/EcalTriggerPrimitives/src/TPGCheck.cc
@@ -19,7 +19,7 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -41,7 +41,7 @@ using namespace std;
 // class declaration
 //
 
-class TPGCheck : public edm::EDAnalyzer {
+class TPGCheck : public edm::one::EDAnalyzer<> {
 public:
   explicit TPGCheck(const edm::ParameterSet &);
   ~TPGCheck() override;