Remove compilation warnings in several packages of RecoBTag

cms-sw · Jan 26, 2022 · c1862d9 · c1862d9
1 parent f88f508
commit c1862d9
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/RecoBTag/ImpactParameter/test/IPAnalyzer.cc b/RecoBTag/ImpactParameter/test/IPAnalyzer.cc
@@ -18,7 +18,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"
@@ -49,7 +49,7 @@ using namespace reco;
 // class decleration
 //
 
-class IPAnalyzer : public edm::EDAnalyzer {
+class IPAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit IPAnalyzer(const edm::ParameterSet&);
   ~IPAnalyzer() {}

diff --git a/RecoBTag/Skimming/interface/BTagSkimLeptonJet.h b/RecoBTag/Skimming/interface/BTagSkimLeptonJet.h
@@ -11,13 +11,13 @@
  */
 
 #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/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-class BTagSkimLeptonJet : public edm::EDFilter {
+class BTagSkimLeptonJet : public edm::one::EDFilter<> {
 public:
   explicit BTagSkimLeptonJet(const edm::ParameterSet&);
   ~BTagSkimLeptonJet() override;

diff --git a/RecoBTag/Skimming/interface/BTagSkimMC.h b/RecoBTag/Skimming/interface/BTagSkimMC.h
@@ -1,7 +1,7 @@
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/one/EDFilter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class BTagSkimMC : public edm::EDFilter {
+class BTagSkimMC : public edm::one::EDFilter<> {
 public:
   /// constructor
   BTagSkimMC(const edm::ParameterSet&);

diff --git a/RecoBTag/SoftLepton/test/testLeptonAssociator.cc b/RecoBTag/SoftLepton/test/testLeptonAssociator.cc
@@ -6,7 +6,7 @@
 #include <tuple>
 
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -28,7 +28,7 @@ namespace std {
   };
 }  // namespace std
 
-class testLeptonAssociator : public edm::EDAnalyzer {
+class testLeptonAssociator : public edm::one::EDAnalyzer<> {
 public:
   explicit testLeptonAssociator(const edm::ParameterSet& iConfig);
   virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& setup) override;

diff --git a/RecoBTag/SoftLepton/test/testMuonAssociator.cc b/RecoBTag/SoftLepton/test/testMuonAssociator.cc
@@ -5,7 +5,7 @@
 #include <set>
 
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -26,7 +26,7 @@ namespace std {
   };
 }  // namespace std
 
-class testMuonAssociator : public edm::EDAnalyzer {
+class testMuonAssociator : public edm::one::EDAnalyzer<> {
 public:
   explicit testMuonAssociator(const edm::ParameterSet& iConfig);
   virtual ~testMuonAssociator();

diff --git a/RecoBTag/TrackProbability/test/CalibrationSkeleton.cc b/RecoBTag/TrackProbability/test/CalibrationSkeleton.cc
@@ -24,7 +24,7 @@ using namespace std;
 
 // 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"

diff --git a/RecoBTag/TrackProbability/test/TrackProbabilityAnalyzer.cc b/RecoBTag/TrackProbability/test/TrackProbabilityAnalyzer.cc
@@ -24,7 +24,7 @@ using namespace std;
 
 // 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/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -53,7 +53,7 @@ using namespace reco;
 // class decleration
 //
 
-class TrackProbabilityAnalyzer : public edm::EDAnalyzer {
+class TrackProbabilityAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit TrackProbabilityAnalyzer(const edm::ParameterSet&);
   ~TrackProbabilityAnalyzer() {}

diff --git a/RecoBTag/TrackProbability/test/TrackProbabilityXMLtoDB.cc b/RecoBTag/TrackProbability/test/TrackProbabilityXMLtoDB.cc
@@ -24,7 +24,7 @@ using namespace std;
 
 // 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"

diff --git a/RecoBTag/XMLCalibration/test/XMLCalibrationTest.cc b/RecoBTag/XMLCalibration/test/XMLCalibrationTest.cc
@@ -5,7 +5,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/EventSetup.h"
@@ -24,7 +24,7 @@ class TestCategory;
 ///This is an example of how to use the AlgorithmCalibration stuff
 // to read the calibrated objects from a .xml file
 
-class XMLCalibrationTest : public edm::EDAnalyzer {
+class XMLCalibrationTest : public edm::one::EDAnalyzer<> {
 public:
   explicit XMLCalibrationTest(const edm::ParameterSet&);
   ~XMLCalibrationTest();