Merge pull request #36736 from bsunanda/Run3-gex113A

Run3-gex113A Remove compilation warnings in CaloOnlineTools/EcalTools
cms-sw · Jan 22, 2022 · c3c413e · c3c413e
2 parents 39bebb7 + 2d417a4
commit c3c413e
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 18 deletions.
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.h b/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.h
@@ -25,7 +25,7 @@
 
 // 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 "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -43,7 +43,7 @@
 // class declaration
 //
 
-class EcalBxOrbitNumberGrapher : public edm::EDAnalyzer {
+class EcalBxOrbitNumberGrapher : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalBxOrbitNumberGrapher(const edm::ParameterSet&);
   ~EcalBxOrbitNumberGrapher() override;

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.h b/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.h
@@ -7,15 +7,15 @@
  *
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include <DataFormats/EcalRawData/interface/EcalRawDataCollections.h>
 #include <iostream>
 #include <vector>
 
-class EcalDCCHeaderDisplay : public edm::EDAnalyzer {
+class EcalDCCHeaderDisplay : public edm::one::EDAnalyzer<> {
 public:
   EcalDCCHeaderDisplay(const edm::ParameterSet& ps);
 

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.h b/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.h
@@ -21,7 +21,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/one/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -34,7 +34,7 @@
 // class declaration
 //
 
-class EcalExclusiveTrigFilter : public edm::EDFilter {
+class EcalExclusiveTrigFilter : public edm::one::EDFilter<> {
 public:
   explicit EcalExclusiveTrigFilter(const edm::ParameterSet&);
   ~EcalExclusiveTrigFilter() override;

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalFEDWithCRCErrorProducer.cc b/CaloOnlineTools/EcalTools/plugins/EcalFEDWithCRCErrorProducer.cc
@@ -27,7 +27,7 @@ Description: <one line class summary>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 
 #include <string>
 #include <iostream>
@@ -41,7 +41,7 @@ Description: <one line class summary>
 // class declaration
 //
 
-class EcalFEDWithCRCErrorProducer : public edm::EDProducer {
+class EcalFEDWithCRCErrorProducer : public edm::one::EDProducer<> {
 public:
   explicit EcalFEDWithCRCErrorProducer(const edm::ParameterSet&);
   ~EcalFEDWithCRCErrorProducer() override;

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.h b/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.h
@@ -4,7 +4,7 @@
  *
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -22,7 +22,7 @@
 
 #include <iomanip>
 
-class EcalHexDisplay : public edm::EDAnalyzer {
+class EcalHexDisplay : public edm::one::EDAnalyzer<> {
 public:
   EcalHexDisplay(const edm::ParameterSet& ps);
 

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.cc b/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.cc
@@ -7,7 +7,6 @@
  *
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include <DataFormats/EcalDigi/interface/EcalDigiCollections.h>

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.h b/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.h
@@ -1,7 +1,7 @@
 #ifndef ECALPNGRAPHS_h
 #define ECALPNGRAPHS_h
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include <DataFormats/EcalDigi/interface/EcalDigiCollections.h>
@@ -17,7 +17,7 @@
 #include "TFile.h"
 #include "TGraph.h"
 
-class EcalPnGraphs : public edm::EDAnalyzer {
+class EcalPnGraphs : public edm::one::EDAnalyzer<> {
 public:
   EcalPnGraphs(const edm::ParameterSet& ps);
   ~EcalPnGraphs() override;

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.h b/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.h
@@ -21,7 +21,7 @@
 
 // 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 "FWCore/Framework/interface/MakerMacros.h"
@@ -43,7 +43,7 @@
 // class decleration
 //
 
-class EcalPulseShapeGrapher : public edm::EDAnalyzer {
+class EcalPulseShapeGrapher : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalPulseShapeGrapher(const edm::ParameterSet&);
   ~EcalPulseShapeGrapher() override;

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc
@@ -17,7 +17,6 @@
 
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

diff --git a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h
@@ -21,7 +21,7 @@
 // user include files
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/one/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -43,7 +43,7 @@
 // class declaration
 //
 
-class EcalRecHitsFilter : public edm::EDFilter {
+class EcalRecHitsFilter : public edm::one::EDFilter<> {
 public:
   explicit EcalRecHitsFilter(const edm::ParameterSet&);
   ~EcalRecHitsFilter() override;