diff --git a/RecoJets/JetAnalyzers/interface/CMSDAS11DijetAnalyzer.h b/RecoJets/JetAnalyzers/interface/CMSDAS11DijetAnalyzer.h
index 0bf99c45071d3..79be3842457cf 100644
--- a/RecoJets/JetAnalyzers/interface/CMSDAS11DijetAnalyzer.h
+++ b/RecoJets/JetAnalyzers/interface/CMSDAS11DijetAnalyzer.h
@@ -8,7 +8,7 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
 
@@ -17,7 +17,7 @@
 class TH1D;
 class TH2D;
 
-class CMSDAS11DijetAnalyzer : public edm::EDAnalyzer {
+class CMSDAS11DijetAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   CMSDAS11DijetAnalyzer(const edm::ParameterSet&);
   void analyze(const edm::Event&, const edm::EventSetup&) override;
diff --git a/RecoJets/JetAnalyzers/interface/CMSDAS11DijetTestAnalyzer.h b/RecoJets/JetAnalyzers/interface/CMSDAS11DijetTestAnalyzer.h
index 0c382bf67af11..a456256e04bd6 100644
--- a/RecoJets/JetAnalyzers/interface/CMSDAS11DijetTestAnalyzer.h
+++ b/RecoJets/JetAnalyzers/interface/CMSDAS11DijetTestAnalyzer.h
@@ -8,7 +8,7 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
 
@@ -17,7 +17,7 @@
 class TH1D;
 class TH2D;
 
-class CMSDAS11DijetTestAnalyzer : public edm::EDAnalyzer {
+class CMSDAS11DijetTestAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   CMSDAS11DijetTestAnalyzer(const edm::ParameterSet&);
   void analyze(const edm::Event&, const edm::EventSetup&) override;
diff --git a/RecoJets/JetAnalyzers/interface/CaloTowersExample.h b/RecoJets/JetAnalyzers/interface/CaloTowersExample.h
index 9fdde512fa686..c4aa6808577e9 100644
--- a/RecoJets/JetAnalyzers/interface/CaloTowersExample.h
+++ b/RecoJets/JetAnalyzers/interface/CaloTowersExample.h
@@ -8,11 +8,11 @@
  * \version 1
  *
  */
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 class TFile;
 
-class CaloTowersExample : public edm::EDAnalyzer {
+class CaloTowersExample : public edm::one::EDAnalyzer<> {
 public:
   CaloTowersExample(const edm::ParameterSet&);
 
diff --git a/RecoJets/JetAnalyzers/interface/DijetMass.h b/RecoJets/JetAnalyzers/interface/DijetMass.h
index 44320e9993b78..ca03bc4fa72f9 100644
--- a/RecoJets/JetAnalyzers/interface/DijetMass.h
+++ b/RecoJets/JetAnalyzers/interface/DijetMass.h
@@ -17,10 +17,10 @@ class TFile;
      Modified and cleaned up to work in 3.3.X
  *
  */
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 template <class Jet>
-class DijetMass : public edm::EDAnalyzer {
+class DijetMass : public edm::one::EDAnalyzer<> {
 public:
   DijetMass(const edm::ParameterSet&);
 
diff --git a/RecoJets/JetAnalyzers/interface/DijetRatio.h b/RecoJets/JetAnalyzers/interface/DijetRatio.h
index 6d7227dc11acd..2d6ef3463fd34 100644
--- a/RecoJets/JetAnalyzers/interface/DijetRatio.h
+++ b/RecoJets/JetAnalyzers/interface/DijetRatio.h
@@ -30,7 +30,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"
 
@@ -118,7 +118,7 @@ void histoFill(TH1F* jetHisto[], edm::Handle<R> jetsRec, double eta1, double eta
 // class decleration
 //
 template <class Jet>
-class DijetRatio : public edm::EDAnalyzer {
+class DijetRatio : public edm::one::EDAnalyzer<> {
 public:
   explicit DijetRatio(const edm::ParameterSet&);
   ~DijetRatio() override;
diff --git a/RecoJets/JetAnalyzers/interface/JetAnaPythia.h b/RecoJets/JetAnalyzers/interface/JetAnaPythia.h
index 8838f32d76462..79efd6cbdb493 100644
--- a/RecoJets/JetAnalyzers/interface/JetAnaPythia.h
+++ b/RecoJets/JetAnalyzers/interface/JetAnaPythia.h
@@ -10,10 +10,10 @@
 #include "TNamed.h"
 #include <vector>
 #include <map>
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 template <class Jet>
-class JetAnaPythia : public edm::EDAnalyzer {
+class JetAnaPythia : public edm::one::EDAnalyzer<> {
 public:
   JetAnaPythia(edm::ParameterSet const& cfg);
 
diff --git a/RecoJets/JetAnalyzers/interface/JetCorExample.h b/RecoJets/JetAnalyzers/interface/JetCorExample.h
index 9247ce6798b4e..98ecb64cca742 100644
--- a/RecoJets/JetAnalyzers/interface/JetCorExample.h
+++ b/RecoJets/JetAnalyzers/interface/JetCorExample.h
@@ -9,10 +9,10 @@
 #include "TNamed.h"
 #include <vector>
 #include <map>
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 template <class Jet>
-class JetCorExample : public edm::EDAnalyzer {
+class JetCorExample : public edm::one::EDAnalyzer<> {
 public:
   JetCorExample(edm::ParameterSet const& cfg);
 
diff --git a/RecoJets/JetAnalyzers/interface/JetPlotsExample.h b/RecoJets/JetAnalyzers/interface/JetPlotsExample.h
index 90135b3a2111b..c210e43175d7c 100644
--- a/RecoJets/JetAnalyzers/interface/JetPlotsExample.h
+++ b/RecoJets/JetAnalyzers/interface/JetPlotsExample.h
@@ -9,10 +9,10 @@
 #include "TNamed.h"
 #include <vector>
 #include <map>
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 template <class Jet>
-class JetPlotsExample : public edm::EDAnalyzer {
+class JetPlotsExample : public edm::one::EDAnalyzer<> {
 public:
   JetPlotsExample(edm::ParameterSet const& cfg);
 
diff --git a/RecoJets/JetAnalyzers/interface/JetToDigiDump.h b/RecoJets/JetAnalyzers/interface/JetToDigiDump.h
index d22cf7b3e348a..0fef1dcd32d27 100644
--- a/RecoJets/JetAnalyzers/interface/JetToDigiDump.h
+++ b/RecoJets/JetAnalyzers/interface/JetToDigiDump.h
@@ -10,9 +10,9 @@
  * \version 1
  *
  */
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
-class JetToDigiDump : public edm::EDAnalyzer {
+class JetToDigiDump : public edm::one::EDAnalyzer<> {
 public:
   JetToDigiDump(const edm::ParameterSet&);
 
diff --git a/RecoJets/JetAnalyzers/interface/JetValidation.h b/RecoJets/JetAnalyzers/interface/JetValidation.h
index 846656f024181..b66eb6c2b5589 100644
--- a/RecoJets/JetAnalyzers/interface/JetValidation.h
+++ b/RecoJets/JetAnalyzers/interface/JetValidation.h
@@ -12,9 +12,9 @@
 #include "TNamed.h"
 #include <vector>
 #include <map>
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
-class JetValidation : public edm::EDAnalyzer {
+class JetValidation : public edm::one::EDAnalyzer<> {
 public:
   JetValidation(edm::ParameterSet const& cfg);
 
diff --git a/RecoJets/JetAnalyzers/interface/SimpleJetDump.h b/RecoJets/JetAnalyzers/interface/SimpleJetDump.h
index a054a3274281c..3e89a67a8820a 100644
--- a/RecoJets/JetAnalyzers/interface/SimpleJetDump.h
+++ b/RecoJets/JetAnalyzers/interface/SimpleJetDump.h
@@ -8,9 +8,9 @@
  * \version 1
  *
  */
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
-class SimpleJetDump : public edm::EDAnalyzer {
+class SimpleJetDump : public edm::one::EDAnalyzer<> {
 public:
   SimpleJetDump(const edm::ParameterSet&);
 
diff --git a/RecoJets/JetAnalyzers/interface/myFastSimVal.h b/RecoJets/JetAnalyzers/interface/myFastSimVal.h
index 1cf4254aab948..d26620fc4eac7 100644
--- a/RecoJets/JetAnalyzers/interface/myFastSimVal.h
+++ b/RecoJets/JetAnalyzers/interface/myFastSimVal.h
@@ -9,11 +9,11 @@
  * \version 1
  *
  */
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 class TFile;
 
-class myFastSimVal : public edm::EDAnalyzer {
+class myFastSimVal : public edm::one::EDAnalyzer<> {
 public:
   myFastSimVal(const edm::ParameterSet&);
 
diff --git a/RecoJets/JetAnalyzers/interface/myRawAna.h b/RecoJets/JetAnalyzers/interface/myRawAna.h
index 2c0c08c365fa2..f042a38fc49ac 100644
--- a/RecoJets/JetAnalyzers/interface/myRawAna.h
+++ b/RecoJets/JetAnalyzers/interface/myRawAna.h
@@ -12,13 +12,13 @@
  * \version 1
  *
  */
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 
 // class TFile;
 
-class myRawAna : public edm::EDAnalyzer {
+class myRawAna : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   myRawAna(const edm::ParameterSet&);
 
diff --git a/RecoJets/JetAnalyzers/interface/ptHatFilter.h b/RecoJets/JetAnalyzers/interface/ptHatFilter.h
deleted file mode 100644
index 805e160b5553f..0000000000000
--- a/RecoJets/JetAnalyzers/interface/ptHatFilter.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Name: ptHatFilter.h
-// Description:  Class header to filter events in a range of Monte Carlo ptHat.
-// Author: R. Harris
-// Date:  28 - October - 2008
-#ifndef ptHatFilter_h
-#define ptHatFilter_h
-#include "FWCore/Framework/interface/EDFilter.h"
-class ptHatFilter : public edm::EDFilter {
-public:
-  ptHatFilter(const edm::ParameterSet&);
-  ~ptHatFilter() override;
-  void beginJob() override;
-  bool filter(edm::Event& e, edm::EventSetup const& iSetup) override;
-  void endJob() override;
-
-private:
-  double ptHatLowerCut;
-  double ptHatUpperCut;
-  int totalEvents;
-  int acceptedEvents;
-};
-#endif
diff --git a/RecoJets/JetAnalyzers/src/CMSDAS11DijetAnalyzer.cc b/RecoJets/JetAnalyzers/src/CMSDAS11DijetAnalyzer.cc
index 1f762b5247bc2..f4f4d19253028 100644
--- a/RecoJets/JetAnalyzers/src/CMSDAS11DijetAnalyzer.cc
+++ b/RecoJets/JetAnalyzers/src/CMSDAS11DijetAnalyzer.cc
@@ -18,14 +18,14 @@
 #include <TH1D.h>
 
 CMSDAS11DijetAnalyzer::CMSDAS11DijetAnalyzer(edm::ParameterSet const& params)
-    : edm::EDAnalyzer(),
-      jetSrc(params.getParameter<edm::InputTag>("jetSrc")),
+    : jetSrc(params.getParameter<edm::InputTag>("jetSrc")),
       vertexSrc(params.getParameter<edm::InputTag>("vertexSrc")),
       jetCorrections(params.getParameter<std::string>("jetCorrections")),
       innerDeltaEta(params.getParameter<double>("innerDeltaEta")),
       outerDeltaEta(params.getParameter<double>("outerDeltaEta")),
       JESbias(params.getParameter<double>("JESbias")) {
   // setup file service
+  usesResource(TFileService::kSharedResource);
   edm::Service<TFileService> fs;
 
   const int NBINS = 36;
diff --git a/RecoJets/JetAnalyzers/src/CMSDAS11DijetTestAnalyzer.cc b/RecoJets/JetAnalyzers/src/CMSDAS11DijetTestAnalyzer.cc
index e2775dcf5b64f..2e3ad3fba23db 100644
--- a/RecoJets/JetAnalyzers/src/CMSDAS11DijetTestAnalyzer.cc
+++ b/RecoJets/JetAnalyzers/src/CMSDAS11DijetTestAnalyzer.cc
@@ -20,14 +20,14 @@
 #include <TH2D.h>
 
 CMSDAS11DijetTestAnalyzer::CMSDAS11DijetTestAnalyzer(edm::ParameterSet const& params)
-    : edm::EDAnalyzer(),
-      jetSrc(params.getParameter<edm::InputTag>("jetSrc")),
+    : jetSrc(params.getParameter<edm::InputTag>("jetSrc")),
       vertexSrc(params.getParameter<edm::InputTag>("vertexSrc")),
       jetCorrections(params.getParameter<std::string>("jetCorrections")),
       innerDeltaEta(params.getParameter<double>("innerDeltaEta")),
       outerDeltaEta(params.getParameter<double>("outerDeltaEta")),
       JESbias(params.getParameter<double>("JESbias")) {
   // setup file service
+  usesResource(TFileService::kSharedResource);
   edm::Service<TFileService> fs;
 
   const int NBINS = 36;
diff --git a/RecoJets/JetAnalyzers/src/CalcTopMassExample.cc b/RecoJets/JetAnalyzers/src/CalcTopMassExample.cc
index 380d673e84894..a79df616d10ab 100644
--- a/RecoJets/JetAnalyzers/src/CalcTopMassExample.cc
+++ b/RecoJets/JetAnalyzers/src/CalcTopMassExample.cc
@@ -12,7 +12,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/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -52,7 +52,7 @@
 #include <Math/VectorUtil.h>
 #include <TMath.h>
 
-class calcTopMass : public edm::EDAnalyzer {
+class calcTopMass : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   explicit calcTopMass(const edm::ParameterSet &);
   ~calcTopMass() override{};
@@ -94,6 +94,7 @@ calcTopMass::calcTopMass(const edm::ParameterSet &iConfig) {
   cMass = 1.5;
   qMass = 0.3;
 
+  usesResource(TFileService::kSharedResource);
   Service<TFileService> fs;
   hMassNoCorr = fs->make<TH1F>("hMassNoCorr", "", 100, 100, 300);
   hMassCorFl0 = fs->make<TH1F>("hMassCorFl0", "", 100, 100, 300);
diff --git a/RecoJets/JetAnalyzers/src/FFTJetImageRecorder.cc b/RecoJets/JetAnalyzers/src/FFTJetImageRecorder.cc
index efdb90225bba1..ad84d54df4f36 100644
--- a/RecoJets/JetAnalyzers/src/FFTJetImageRecorder.cc
+++ b/RecoJets/JetAnalyzers/src/FFTJetImageRecorder.cc
@@ -24,7 +24,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"
@@ -44,7 +44,7 @@
 //
 // class declaration
 //
-class FFTJetImageRecorder : public edm::EDAnalyzer {
+class FFTJetImageRecorder : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   explicit FFTJetImageRecorder(const edm::ParameterSet&);
   FFTJetImageRecorder() = delete;
@@ -69,6 +69,7 @@ class FFTJetImageRecorder : public edm::EDAnalyzer {
 FFTJetImageRecorder::FFTJetImageRecorder(const edm::ParameterSet& ps)
     : init_param(edm::InputTag, histoLabel), counter(0) {
   histoToken = consumes<TH3F>(histoLabel);
+  usesResource(TFileService::kSharedResource);
 }
 
 FFTJetImageRecorder::~FFTJetImageRecorder() {}
diff --git a/RecoJets/JetAnalyzers/src/FFTJetPileupAnalyzer.cc b/RecoJets/JetAnalyzers/src/FFTJetPileupAnalyzer.cc
index 918bf9c5fc4c1..e79d98f02fe44 100644
--- a/RecoJets/JetAnalyzers/src/FFTJetPileupAnalyzer.cc
+++ b/RecoJets/JetAnalyzers/src/FFTJetPileupAnalyzer.cc
@@ -24,7 +24,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/ServiceRegistry/interface/Service.h"
@@ -49,7 +49,7 @@
 //
 // class declaration
 //
-class FFTJetPileupAnalyzer : public edm::EDAnalyzer {
+class FFTJetPileupAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   explicit FFTJetPileupAnalyzer(const edm::ParameterSet&);
   FFTJetPileupAnalyzer() = delete;
@@ -133,6 +133,8 @@ FFTJetPileupAnalyzer::FFTJetPileupAnalyzer(const edm::ParameterSet& ps)
       totalNpu(-1),
       totalNPV(-1),
       counter(0) {
+  usesResource(TFileService::kSharedResource);
+
   if (collectPileup || collectOOTPileup)
     pileupToken = consumes<std::vector<PileupSummaryInfo> >(pileupLabel);
 
diff --git a/RecoJets/JetAnalyzers/src/FlavorJetCorrectionExample.cc b/RecoJets/JetAnalyzers/src/FlavorJetCorrectionExample.cc
index ae17fa39ff904..741581c5aa3ce 100644
--- a/RecoJets/JetAnalyzers/src/FlavorJetCorrectionExample.cc
+++ b/RecoJets/JetAnalyzers/src/FlavorJetCorrectionExample.cc
@@ -5,10 +5,10 @@
 
 #include <string>
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-class FlavorJetCorrectionExample : public edm::EDAnalyzer {
+class FlavorJetCorrectionExample : public edm::one::EDAnalyzer<> {
 public:
   explicit FlavorJetCorrectionExample(const edm::ParameterSet& fParameters);
   ~FlavorJetCorrectionExample() override {}
diff --git a/RecoJets/JetAnalyzers/src/JetIdSelector.cc b/RecoJets/JetAnalyzers/src/JetIdSelector.cc
index ab77696c5afd2..7a2eebc6dc16d 100644
--- a/RecoJets/JetAnalyzers/src/JetIdSelector.cc
+++ b/RecoJets/JetAnalyzers/src/JetIdSelector.cc
@@ -26,7 +26,7 @@
 
 #include "PhysicsTools/SelectorUtils/interface/JetIDSelectionFunctor.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -56,7 +56,7 @@
 // class definition
 ////////////////////////////////////////////////////////////////////////////////
 template <typename T>
-class JetIdSelector : public edm::EDProducer {
+class JetIdSelector : public edm::one::EDProducer<> {
 public:
   typedef std::vector<T> JetCollection;
   // construction/destruction
diff --git a/RecoJets/JetAnalyzers/src/PartonJetCorrectionExample.cc b/RecoJets/JetAnalyzers/src/PartonJetCorrectionExample.cc
index b57f711fe56ee..dcc97ea5d8b32 100644
--- a/RecoJets/JetAnalyzers/src/PartonJetCorrectionExample.cc
+++ b/RecoJets/JetAnalyzers/src/PartonJetCorrectionExample.cc
@@ -5,10 +5,10 @@
 
 #include <string>
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-class PartonJetCorrectionExample : public edm::EDAnalyzer {
+class PartonJetCorrectionExample : public edm::one::EDAnalyzer<> {
 public:
   explicit PartonJetCorrectionExample(const edm::ParameterSet& fParameters);
   ~PartonJetCorrectionExample() override {}
diff --git a/RecoJets/JetAnalyzers/src/myRawAna.cc b/RecoJets/JetAnalyzers/src/myRawAna.cc
index 4df2e765e3333..fd1d1473f348b 100644
--- a/RecoJets/JetAnalyzers/src/myRawAna.cc
+++ b/RecoJets/JetAnalyzers/src/myRawAna.cc
@@ -28,7 +28,7 @@ using namespace std;
 // Nothing passed from .cfg yet, but I leave the syntax here for
 // future reference.
 
-myRawAna::myRawAna(const ParameterSet& cfg) {}
+myRawAna::myRawAna(const ParameterSet& cfg) { usesResource(TFileService::kSharedResource); }
 
 // ************************
 // ************************
diff --git a/RecoJets/JetAnalyzers/src/ptHatFilter.cc b/RecoJets/JetAnalyzers/src/ptHatFilter.cc
index 246be8322b6a5..52f9327d2c9d5 100644
--- a/RecoJets/JetAnalyzers/src/ptHatFilter.cc
+++ b/RecoJets/JetAnalyzers/src/ptHatFilter.cc
@@ -2,19 +2,32 @@
 // Description:  Filter events in a range of Monte Carlo ptHat.
 // Author: R. Harris
 // Date:  28 - October - 2008
-#include "RecoJets/JetAnalyzers/interface/ptHatFilter.h"
+#include "FWCore/Framework/interface/global/EDFilter.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
-#include "SimDataFormats/GeneratorProducts/interface/GenRunInfoProduct.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include <TFile.h>
-#include <cmath>
+#include <atomic>
+
+class ptHatFilter : public edm::global::EDFilter<> {
+public:
+  ptHatFilter(const edm::ParameterSet&);
+  void beginJob() override;
+  bool filter(edm::StreamID, edm::Event& e, edm::EventSetup const& iSetup) const override;
+  void endJob() override;
+
+private:
+  const edm::EDGetTokenT<double> token_;
+  double ptHatLowerCut;
+  double ptHatUpperCut;
+  mutable std::atomic<int> totalEvents;
+  mutable std::atomic<int> acceptedEvents;
+};
+
 using namespace edm;
 using namespace reco;
 using namespace std;
 ////////////////////////////////////////////////////////////////////////////////////////
-ptHatFilter::ptHatFilter(edm::ParameterSet const& cfg) {
+ptHatFilter::ptHatFilter(edm::ParameterSet const& cfg) : token_{consumes(edm::InputTag("genEventScale"))} {
   ptHatLowerCut = cfg.getParameter<double>("ptHatLowerCut");
   ptHatUpperCut = cfg.getParameter<double>("ptHatUpperCut");
 }
@@ -24,16 +37,11 @@ void ptHatFilter::beginJob() {
   acceptedEvents = 0;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-ptHatFilter::~ptHatFilter() {}
-
 ////////////////////////////////////////////////////////////////////////////////////////
-bool ptHatFilter::filter(edm::Event& evt, edm::EventSetup const& iSetup) {
+bool ptHatFilter::filter(edm::StreamID, edm::Event& evt, edm::EventSetup const& iSetup) const {
   bool result = false;
   totalEvents++;
-  edm::Handle<double> genEventScale;
-  evt.getByLabel("genEventScale", genEventScale);
-  double pt_hat = *genEventScale;
+  double pt_hat = evt.get(token_);
   if (pt_hat > ptHatLowerCut && pt_hat < ptHatUpperCut) {
     acceptedEvents++;
     result = true;