diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.cc
index c49194ed42af9..46259d9dc6af7 100644
--- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.cc
+++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.cc
@@ -76,8 +76,8 @@ void EcalStatusAnalyzer::beginJob() {
 }
 
 //========================================================================
-void EcalStatusAnalyzer::analyze(edm::StreamID,const edm::Event & e, const edm::EventSetup& c) const {
-// void EcalStatusAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c) {
+//void EcalStatusAnalyzer::analyze(edm::StreamID,const edm::Event & e, const edm::EventSetup& c) const {
+void EcalStatusAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c) {
   //========================================================================
 
   ++iEvent;
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h
index ecac5dc0645f3..585c0557a304b 100644
--- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h
+++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h
@@ -4,19 +4,20 @@
 #include <map>
 
 #include <memory>
-#include <FWCore/Framework/interface/global/EDAnalyzer.h>
+#include <FWCore/Framework/interface/stream/EDAnalyzer.h>
 
 class Timestamp;
 
-class EcalStatusAnalyzer : public edm::global::EDAnalyzer<> {
+class EcalStatusAnalyzer : public edm::stream::EDAnalyzer<> {
 public:
   explicit EcalStatusAnalyzer(const edm::ParameterSet& iConfig);
   ~EcalStatusAnalyzer() override;
 
-  // void analyze(edm::StreamID, const edm::Event& e, const edm::EventSetup& c) override;
-  void analyze(edm::StreamID, const edm::Event& e, const edm::EventSetup& c) const override ;
-  void beginJob() override;
-  void endJob() override;
+  void analyze(const edm::Event& e, const edm::EventSetup& c);
+  //void analyze(edm::StreamID, const edm::Event& e, const edm::EventSetup& c);
+  //void analyze(edm::StreamID, const edm::Event& e, const edm::EventSetup& c) const override ;
+  void beginJob();
+  void endJob();
 
   enum EcalLaserColorType {
     iBLUE = 0,
diff --git a/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h b/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h
index 90511706b4f7f..7c344978aa267 100644
--- a/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h
+++ b/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include <FWCore/Framework/interface/stream/EDAnalyzer.h>
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
@@ -41,7 +41,7 @@
  * the each output file.Once a file is completed (see above), it is renamed
  * without the enclosing .part suffix.
  */
-class LaserSorter : public edm::EDAnalyzer {
+class LaserSorter : public edm::stream::EDAnalyzer<> {
   //inner classes
 private:
   struct IndexRecord {
@@ -121,8 +121,8 @@ class LaserSorter : public edm::EDAnalyzer {
   //methods
 public:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override;
-  void beginJob() override;
+  void endJob() ;
+  void beginJob() ;
   void beginRun(edm::Run const&, edm::EventSetup const&) override;
 
 private:
diff --git a/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h b/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h
index c20e1d8a47712..16df1d5d9dfce 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h
+++ b/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h
@@ -12,7 +12,7 @@
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h"
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.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 <map>
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 
-class testChannel : public edm::EDAnalyzer {
+class testChannel : public edm::one::EDAnalyzer<> {
 public:
   //! Constructor
   testChannel(const edm::ParameterSet &ps);
diff --git a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamReaderFromDB.cc b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamReaderFromDB.cc
index f214705ea2e57..789bda843e01d 100644
--- a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamReaderFromDB.cc
+++ b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamReaderFromDB.cc
@@ -3,7 +3,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"
@@ -12,14 +12,14 @@
 
 using namespace std;
 
-class EcalTPGParamReaderFromDB : public edm::EDAnalyzer {
+class EcalTPGParamReaderFromDB : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalTPGParamReaderFromDB(const edm::ParameterSet&);
   ~EcalTPGParamReaderFromDB() override;
 
 private:
   void beginJob() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event&, const edm::EventSetup&);
   void endJob() override;
 
   std::string host;
@@ -48,10 +48,6 @@ EcalTPGParamReaderFromDB::~EcalTPGParamReaderFromDB() {}
 void EcalTPGParamReaderFromDB::analyze(const edm::Event& ev, const edm::EventSetup& es) {
   EcalTPGDBApp app(sid, user, pass);
 
-  //int i ;
-  //app.readTPGPedestals(i);
-  //app.writeTPGLUT();
-  //app.writeTPGWeights();
 }
 
 void EcalTPGParamReaderFromDB::beginJob() {}
diff --git a/CalibCalorimetry/EcalTPGTools/plugins/testEcalTPGScale.h b/CalibCalorimetry/EcalTPGTools/plugins/testEcalTPGScale.h
index 5b8aa1343471e..b1ce3640ac20c 100644
--- a/CalibCalorimetry/EcalTPGTools/plugins/testEcalTPGScale.h
+++ b/CalibCalorimetry/EcalTPGTools/plugins/testEcalTPGScale.h
@@ -9,7 +9,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"
@@ -28,7 +28,7 @@
 
 class CaloSubdetectorGeometry;
 
-class testEcalTPGScale : public edm::EDAnalyzer {
+class testEcalTPGScale : public edm::one::EDAnalyzer<> {
 public:
   explicit testEcalTPGScale(edm::ParameterSet const& pSet);
   void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) override;