diff --git a/CondTools/SiStrip/plugins/SiStripApvGainReader.cc b/CondTools/SiStrip/plugins/SiStripApvGainReader.cc
index 2686023b83615..10dec6cca6783 100644
--- a/CondTools/SiStrip/plugins/SiStripApvGainReader.cc
+++ b/CondTools/SiStrip/plugins/SiStripApvGainReader.cc
@@ -15,6 +15,8 @@ SiStripApvGainReader::SiStripApvGainReader(const edm::ParameterSet& iConfig)
       formatedOutput_(iConfig.getUntrackedParameter<std::string>("outputFile", "")),
       gainType_(iConfig.getUntrackedParameter<uint32_t>("gainType", 1)),
       gainToken_(esConsumes()) {
+  usesResource(TFileService::kSharedResource);
+
   if (fs_.isAvailable()) {
     tree_ = fs_->make<TTree>("Gains", "Gains");
 
@@ -25,8 +27,6 @@ SiStripApvGainReader::SiStripApvGainReader(const edm::ParameterSet& iConfig)
   }
 }
 
-SiStripApvGainReader::~SiStripApvGainReader() {}
-
 void SiStripApvGainReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   const auto& stripApvGain = iSetup.getData(gainToken_);
   edm::LogInfo("SiStripApvGainReader") << "[SiStripApvGainReader::analyze] End Reading SiStripApvGain" << std::endl;
diff --git a/CondTools/SiStrip/plugins/SiStripApvGainReader.h b/CondTools/SiStrip/plugins/SiStripApvGainReader.h
index 627fee902642b..6551d4184fc81 100644
--- a/CondTools/SiStrip/plugins/SiStripApvGainReader.h
+++ b/CondTools/SiStrip/plugins/SiStripApvGainReader.h
@@ -6,7 +6,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"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -24,10 +24,10 @@
 
 class SiStripGain;
 
-class SiStripApvGainReader : public edm::EDAnalyzer {
+class SiStripApvGainReader : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   explicit SiStripApvGainReader(const edm::ParameterSet&);
-  ~SiStripApvGainReader() override;
+  ~SiStripApvGainReader() override = default;
 
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
diff --git a/CondTools/SiStrip/plugins/SiStripBadStripReader.cc b/CondTools/SiStrip/plugins/SiStripBadStripReader.cc
index 2bb881dead7ef..320086d35a93c 100644
--- a/CondTools/SiStrip/plugins/SiStripBadStripReader.cc
+++ b/CondTools/SiStrip/plugins/SiStripBadStripReader.cc
@@ -1,5 +1,5 @@
 #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/MessageLogger/interface/MessageLogger.h"
@@ -11,7 +11,7 @@
 #include <cstdio>
 #include <sys/time.h>
 
-class SiStripBadStripReader : public edm::EDAnalyzer {
+class SiStripBadStripReader : public edm::one::EDAnalyzer<> {
 public:
   explicit SiStripBadStripReader(const edm::ParameterSet& iConfig)
       : printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 1)), badStripToken_(esConsumes()) {}
@@ -25,7 +25,7 @@ class SiStripBadStripReader : public edm::EDAnalyzer {
   edm::ESGetToken<SiStripBadStrip, SiStripBadStripRcd> badStripToken_;
 };
 
-SiStripBadStripReader::~SiStripBadStripReader() {}
+SiStripBadStripReader::~SiStripBadStripReader() = default;
 
 void SiStripBadStripReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   const auto& badStrip = iSetup.getData(badStripToken_);
diff --git a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc
index e819db9d53025..bb01f2154916a 100644
--- a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc
+++ b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc
@@ -3,13 +3,10 @@
 
 #include <sstream>
 
-SiStripCablingTrackerMap::SiStripCablingTrackerMap(edm::ParameterSet const& conf)
-    : conf_(conf), detCablingToken_(esConsumes()) {}
-
-SiStripCablingTrackerMap::~SiStripCablingTrackerMap() {}
+SiStripCablingTrackerMap::SiStripCablingTrackerMap(edm::ParameterSet const& conf) : detCablingToken_(esConsumes()) {}
 
 void SiStripCablingTrackerMap::beginRun(const edm::Run& run, const edm::EventSetup& es) {
-  tkMap_detCab = new TrackerMap("DetCabling");
+  tkMap_detCab = std::make_unique<TrackerMap>("DetCabling");
 }
 
 //------------------------------------------------------------------------------------------
diff --git a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.h b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.h
index b9c0471a003d5..b1ce7ac03f410 100644
--- a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.h
+++ b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.h
@@ -2,7 +2,7 @@
 #define SiStripCablingTrackerMap_h
 
 #include "FWCore/Utilities/interface/Exception.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/ESHandle.h"
@@ -13,22 +13,20 @@
 
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
 
-class SiStripCablingTrackerMap : public edm::EDAnalyzer {
+class SiStripCablingTrackerMap : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 public:
   SiStripCablingTrackerMap(const edm::ParameterSet& conf);
-  ~SiStripCablingTrackerMap() override;
+  ~SiStripCablingTrackerMap() override = default;
 
   void beginRun(const edm::Run& run, const edm::EventSetup& es) override;
-
   void endJob() override;
-
+  void endRun(const edm::Run& run, const edm::EventSetup& es) override{};
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
 private:
-  edm::ParameterSet conf_;
   edm::ESGetToken<SiStripDetCabling, SiStripDetCablingRcd> detCablingToken_;
 
-  TrackerMap* tkMap_detCab;  //0 for onTrack, 1 for offTrack, 2 for All
+  std::unique_ptr<TrackerMap> tkMap_detCab;  //0 for onTrack, 1 for offTrack, 2 for All
 };
 
 #endif
diff --git a/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.h b/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.h
index c0b0e000a6bbe..8c3957325b1d1 100644
--- a/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.h
+++ b/CondTools/SiStrip/plugins/SiStripDetVOffFakeBuilder.h
@@ -2,7 +2,7 @@
 #define SiStripDetVOff_H
 
 #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/ESHandle.h"
@@ -13,7 +13,7 @@
 
 class TrackerGeometry;
 
-class SiStripDetVOffFakeBuilder : public edm::EDAnalyzer {
+class SiStripDetVOffFakeBuilder : public edm::one::EDAnalyzer<> {
 public:
   explicit SiStripDetVOffFakeBuilder(const edm::ParameterSet& iConfig);
 
diff --git a/CondTools/SiStrip/plugins/SiStripDetVOffReader.cc b/CondTools/SiStrip/plugins/SiStripDetVOffReader.cc
index 346c017c81136..c829e0545bdf6 100644
--- a/CondTools/SiStrip/plugins/SiStripDetVOffReader.cc
+++ b/CondTools/SiStrip/plugins/SiStripDetVOffReader.cc
@@ -9,8 +9,6 @@
 SiStripDetVOffReader::SiStripDetVOffReader(const edm::ParameterSet& iConfig)
     : printdebug_(iConfig.getUntrackedParameter<bool>("printDebug", true)), detVOffToken_(esConsumes()) {}
 
-SiStripDetVOffReader::~SiStripDetVOffReader() {}
-
 void SiStripDetVOffReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   const auto& detVOff = iSetup.getData(detVOffToken_);
   edm::LogInfo("SiStripDetVOffReader") << "[SiStripDetVOffReader::analyze] End Reading SiStripDetVOff" << std::endl;
diff --git a/CondTools/SiStrip/plugins/SiStripDetVOffReader.h b/CondTools/SiStrip/plugins/SiStripDetVOffReader.h
index 82e349f9812c5..ad79ce3b65727 100644
--- a/CondTools/SiStrip/plugins/SiStripDetVOffReader.h
+++ b/CondTools/SiStrip/plugins/SiStripDetVOffReader.h
@@ -6,7 +6,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"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -24,10 +24,10 @@ class SiStripDetVOff;
 //
 // class decleration
 //
-class SiStripDetVOffReader : public edm::EDAnalyzer {
+class SiStripDetVOffReader : public edm::one::EDAnalyzer<> {
 public:
   explicit SiStripDetVOffReader(const edm::ParameterSet&);
-  ~SiStripDetVOffReader() override;
+  ~SiStripDetVOffReader() override = default;
 
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
diff --git a/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.h b/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.h
index f98d0523d6ab1..3d29527da4f0e 100644
--- a/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.h
+++ b/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.h
@@ -4,7 +4,7 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
 #include "CalibTracker/Records/interface/SiStripFecCablingRcd.h"
 #include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
@@ -15,15 +15,15 @@ class SiStripFecCabling;
 class SiStripDetCabling;
 class SiStripRegionCabling;
 
-class SiStripFedCablingBuilder : public edm::EDAnalyzer {
+class SiStripFedCablingBuilder : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 public:
   SiStripFedCablingBuilder(const edm::ParameterSet& iConfig);
 
-  ~SiStripFedCablingBuilder() override{};
+  ~SiStripFedCablingBuilder() = default;
 
   void beginRun(const edm::Run&, const edm::EventSetup&) override;
-
-  void analyze(const edm::Event&, const edm::EventSetup&) override { ; }
+  void analyze(const edm::Event&, const edm::EventSetup&) override {}
+  void endRun(const edm::Run&, const edm::EventSetup&) override{};
 
 private:
   bool printFecCabling_;
diff --git a/CondTools/SiStrip/plugins/SiStripFedCablingReader.h b/CondTools/SiStrip/plugins/SiStripFedCablingReader.h
index f6a84d0f32172..52f7fd539b246 100644
--- a/CondTools/SiStrip/plugins/SiStripFedCablingReader.h
+++ b/CondTools/SiStrip/plugins/SiStripFedCablingReader.h
@@ -1,7 +1,7 @@
 #ifndef CondTools_SiStrip_FedCablingReader_H
 #define CondTools_SiStrip_FedCablingReader_H
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -15,15 +15,14 @@ class SiStripFecCabling;
 class SiStripDetCabling;
 class SiStripRegionCabling;
 
-class SiStripFedCablingReader : public edm::EDAnalyzer {
+class SiStripFedCablingReader : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 public:
   SiStripFedCablingReader(const edm::ParameterSet&);
-
-  ~SiStripFedCablingReader() override { ; }
+  ~SiStripFedCablingReader() = default;
 
   void beginRun(const edm::Run&, const edm::EventSetup&) override;
-
-  void analyze(const edm::Event&, const edm::EventSetup&) override { ; }
+  void endRun(const edm::Run&, const edm::EventSetup&) override{};
+  void analyze(const edm::Event&, const edm::EventSetup&) override{};
 
 private:
   bool printFecCabling_;
diff --git a/CondTools/SiStrip/plugins/SiStripLorentzAngleReader.cc b/CondTools/SiStrip/plugins/SiStripLorentzAngleReader.cc
index d282050b19f25..c0553dfa6f591 100644
--- a/CondTools/SiStrip/plugins/SiStripLorentzAngleReader.cc
+++ b/CondTools/SiStrip/plugins/SiStripLorentzAngleReader.cc
@@ -12,7 +12,6 @@ SiStripLorentzAngleReader::SiStripLorentzAngleReader(const edm::ParameterSet& iC
     : printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 5)),
       label_(iConfig.getUntrackedParameter<std::string>("label", "")),
       laToken_(esConsumes(edm::ESInputTag{"", label_})) {}
-SiStripLorentzAngleReader::~SiStripLorentzAngleReader() {}
 
 void SiStripLorentzAngleReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   const auto& lorentzAngles = iSetup.getData(laToken_);
diff --git a/CondTools/SiStrip/plugins/SiStripLorentzAngleReader.h b/CondTools/SiStrip/plugins/SiStripLorentzAngleReader.h
index 84bcb0e1a4a2b..d5b174a101307 100644
--- a/CondTools/SiStrip/plugins/SiStripLorentzAngleReader.h
+++ b/CondTools/SiStrip/plugins/SiStripLorentzAngleReader.h
@@ -6,7 +6,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"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -21,10 +21,10 @@ class SiStripLorentzAngle;
 //
 // class decleration
 //
-class SiStripLorentzAngleReader : public edm::EDAnalyzer {
+class SiStripLorentzAngleReader : public edm::one::EDAnalyzer<> {
 public:
   explicit SiStripLorentzAngleReader(const edm::ParameterSet&);
-  ~SiStripLorentzAngleReader() override;
+  ~SiStripLorentzAngleReader() override = default;
 
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
diff --git a/CondTools/SiStrip/plugins/SiStripNoisesReader.h b/CondTools/SiStrip/plugins/SiStripNoisesReader.h
index d811148f60638..c03e6f6693111 100644
--- a/CondTools/SiStrip/plugins/SiStripNoisesReader.h
+++ b/CondTools/SiStrip/plugins/SiStripNoisesReader.h
@@ -6,7 +6,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"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -22,7 +22,7 @@
 #include <cstdio>
 #include <sys/time.h>
 
-class SiStripNoisesReader : public edm::EDAnalyzer {
+class SiStripNoisesReader : public edm::one::EDAnalyzer<> {
 public:
   explicit SiStripNoisesReader(const edm::ParameterSet&);
   ~SiStripNoisesReader() override;
diff --git a/CondTools/SiStrip/plugins/SiStripPedestalsReader.cc b/CondTools/SiStrip/plugins/SiStripPedestalsReader.cc
index 1b00144225ece..b528bcd5d2802 100644
--- a/CondTools/SiStrip/plugins/SiStripPedestalsReader.cc
+++ b/CondTools/SiStrip/plugins/SiStripPedestalsReader.cc
@@ -6,8 +6,6 @@ using namespace cms;
 SiStripPedestalsReader::SiStripPedestalsReader(const edm::ParameterSet& iConfig)
     : printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 1)), pedestalsToken_(esConsumes()) {}
 
-SiStripPedestalsReader::~SiStripPedestalsReader() {}
-
 void SiStripPedestalsReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   const auto& pedestals = iSetup.getData(pedestalsToken_);
   edm::LogInfo("SiStripPedestalsReader") << "[SiStripPedestalsReader::analyze] End Reading SiStripPedestals"
diff --git a/CondTools/SiStrip/plugins/SiStripPedestalsReader.h b/CondTools/SiStrip/plugins/SiStripPedestalsReader.h
index bb25f5b89348a..534f8b7cbfaf3 100644
--- a/CondTools/SiStrip/plugins/SiStripPedestalsReader.h
+++ b/CondTools/SiStrip/plugins/SiStripPedestalsReader.h
@@ -6,7 +6,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"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -22,10 +22,10 @@
 #include <cstdio>
 #include <sys/time.h>
 
-class SiStripPedestalsReader : public edm::EDAnalyzer {
+class SiStripPedestalsReader : public edm::one::EDAnalyzer<> {
 public:
   explicit SiStripPedestalsReader(const edm::ParameterSet&);
-  ~SiStripPedestalsReader() override;
+  ~SiStripPedestalsReader() override = default;
 
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
diff --git a/CondTools/SiStrip/plugins/SiStripSummaryReader.cc b/CondTools/SiStrip/plugins/SiStripSummaryReader.cc
index 8c2a5d8d4ba64..c2a1087d03d42 100644
--- a/CondTools/SiStrip/plugins/SiStripSummaryReader.cc
+++ b/CondTools/SiStrip/plugins/SiStripSummaryReader.cc
@@ -11,8 +11,6 @@
 SiStripSummaryReader::SiStripSummaryReader(const edm::ParameterSet& iConfig)
     : printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 1)), summaryToken_(esConsumes()) {}
 
-SiStripSummaryReader::~SiStripSummaryReader() {}
-
 void SiStripSummaryReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   const auto& summary = iSetup.getData(summaryToken_);
   edm::LogInfo("SiStripSummaryReader") << "[SiStripSummaryReader::analyze] End Reading SiStripSummary" << std::endl;
diff --git a/CondTools/SiStrip/plugins/SiStripSummaryReader.h b/CondTools/SiStrip/plugins/SiStripSummaryReader.h
index 1449e8dde99da..f07f9a78137bb 100644
--- a/CondTools/SiStrip/plugins/SiStripSummaryReader.h
+++ b/CondTools/SiStrip/plugins/SiStripSummaryReader.h
@@ -6,7 +6,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"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -17,10 +17,10 @@
 #include "CondFormats/DataRecord/interface/SiStripSummaryRcd.h"
 class SiStripSummary;
 
-class SiStripSummaryReader : public edm::EDAnalyzer {
+class SiStripSummaryReader : public edm::one::EDAnalyzer<> {
 public:
   explicit SiStripSummaryReader(const edm::ParameterSet&);
-  ~SiStripSummaryReader() override;
+  ~SiStripSummaryReader() override = default;
 
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
diff --git a/CondTools/SiStrip/plugins/SiStripThresholdReader.cc b/CondTools/SiStrip/plugins/SiStripThresholdReader.cc
index 14a6a43c69db4..ab8b8c492785b 100644
--- a/CondTools/SiStrip/plugins/SiStripThresholdReader.cc
+++ b/CondTools/SiStrip/plugins/SiStripThresholdReader.cc
@@ -7,8 +7,6 @@ using namespace cms;
 SiStripThresholdReader::SiStripThresholdReader(const edm::ParameterSet& iConfig)
     : printdebug_(iConfig.getUntrackedParameter<uint32_t>("printDebug", 3)), thresholdToken_(esConsumes()) {}
 
-SiStripThresholdReader::~SiStripThresholdReader() {}
-
 void SiStripThresholdReader::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   const auto& thresholds = iSetup.getData(thresholdToken_);
   edm::LogInfo("SiStripThresholdReader") << "[SiStripThresholdReader::analyze] End Reading SiStripThreshold"
diff --git a/CondTools/SiStrip/plugins/SiStripThresholdReader.h b/CondTools/SiStrip/plugins/SiStripThresholdReader.h
index 32234ec98bb7d..5b15e39e0226a 100644
--- a/CondTools/SiStrip/plugins/SiStripThresholdReader.h
+++ b/CondTools/SiStrip/plugins/SiStripThresholdReader.h
@@ -6,7 +6,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"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -22,10 +22,10 @@
 #include <cstdio>
 #include <sys/time.h>
 
-class SiStripThresholdReader : public edm::EDAnalyzer {
+class SiStripThresholdReader : public edm::one::EDAnalyzer<> {
 public:
   explicit SiStripThresholdReader(const edm::ParameterSet&);
-  ~SiStripThresholdReader() override;
+  ~SiStripThresholdReader() override = default;
 
   void analyze(const edm::Event&, const edm::EventSetup&) override;