From 2fcdef7de5a816e273ce611658d689a2b120cf41 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Wed, 4 May 2022 04:06:10 +0200
Subject: [PATCH] Try to avoid reference to depreciated EDFilter/EDAnalyzer
 codes in GeneratorInterface

---
 .../plugins/PythiaFilterMultiAncestor.cc      |  1 -
 .../Herwig6Interface/plugins/Herwig6Filter.cc | 40 ++++++++-----------
 .../interface/TauSpinnerFilter.h              |  3 +-
 .../plugins/TauSpinner/TauSpinnerFilter.cc    |  6 +--
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/GeneratorInterface/GenFilters/plugins/PythiaFilterMultiAncestor.cc b/GeneratorInterface/GenFilters/plugins/PythiaFilterMultiAncestor.cc
index 2a35701cfde9a..4211f0ac0f551 100644
--- a/GeneratorInterface/GenFilters/plugins/PythiaFilterMultiAncestor.cc
+++ b/GeneratorInterface/GenFilters/plugins/PythiaFilterMultiAncestor.cc
@@ -31,7 +31,6 @@ process.jpsi_from_bhadron_filter = cms.EDFilter("PythiaFilterMultiAncestor",
 // user include files
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 
-// #include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/global/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
diff --git a/GeneratorInterface/Herwig6Interface/plugins/Herwig6Filter.cc b/GeneratorInterface/Herwig6Interface/plugins/Herwig6Filter.cc
index 202bf9d1572b0..9ebc732b8ee62 100644
--- a/GeneratorInterface/Herwig6Interface/plugins/Herwig6Filter.cc
+++ b/GeneratorInterface/Herwig6Interface/plugins/Herwig6Filter.cc
@@ -3,7 +3,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -15,34 +15,28 @@
 // class declaration
 //
 
-class Herwig6Filter : public edm::EDFilter {
-   public:
-      explicit Herwig6Filter(const edm::ParameterSet&);
-      ~Herwig6Filter();
+class Herwig6Filter : public edm::stream::EDFilter<> {
+public:
+  explicit Herwig6Filter(const edm::ParameterSet&);
+  ~Herwig6Filter() override = default;
 
-   private:
-      virtual bool filter(edm::Event&, const edm::EventSetup&);
+private:
+  virtual bool filter(edm::Event&, const edm::EventSetup&);
 };
 
-Herwig6Filter::Herwig6Filter(const edm::ParameterSet& ppp) 
-{}
+Herwig6Filter::Herwig6Filter(const edm::ParameterSet& ppp) {}
 
-Herwig6Filter::~Herwig6Filter() 
-{}
-
-bool
-Herwig6Filter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
+bool Herwig6Filter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
    
-   std::vector< Handle<HepMCProduct> > AllProds;
-   iEvent.getManyByType(AllProds);
+  std::vector< Handle<HepMCProduct> > AllProds;
+  iEvent.getManyByType(AllProds);
    
-   if(AllProds.size()==0) {
-     LogInfo("")<<"   Event is skipped and removed.\n";
-     return false;
-   }
-   else return true;
+  if (AllProds.size() == 0) {
+    edm::LogInfo("")<<"   Event is skipped and removed.\n";
+    return false;
+  }
+  else
+    return true;
 }
 
 //define this as a plug-in
diff --git a/GeneratorInterface/TauolaInterface/interface/TauSpinnerFilter.h b/GeneratorInterface/TauolaInterface/interface/TauSpinnerFilter.h
index 76f641b0cc0ef..63ff84fff9646 100644
--- a/GeneratorInterface/TauolaInterface/interface/TauSpinnerFilter.h
+++ b/GeneratorInterface/TauolaInterface/interface/TauSpinnerFilter.h
@@ -28,10 +28,9 @@ class TauSpinnerFilter : public edm::stream::EDFilter<> {
   void setRandomEngine(CLHEP::HepRandomEngine* v) { fRandomEngine = v; }
 
 private:
-  edm::InputTag src_;
+  const edm::EDGetTokenT<double> WTToken_;
   CLHEP::HepRandomEngine* fRandomEngine;
   double ntaus_;
-  edm::EDGetTokenT<double> WTToken_;
 };
 
 #endif
diff --git a/GeneratorInterface/TauolaInterface/plugins/TauSpinner/TauSpinnerFilter.cc b/GeneratorInterface/TauolaInterface/plugins/TauSpinner/TauSpinnerFilter.cc
index e59e4d8057bf7..1c3db19454121 100644
--- a/GeneratorInterface/TauolaInterface/plugins/TauSpinner/TauSpinnerFilter.cc
+++ b/GeneratorInterface/TauolaInterface/plugins/TauSpinner/TauSpinnerFilter.cc
@@ -7,18 +7,16 @@
 #include "FWCore/ServiceRegistry/interface/RandomEngineSentry.h"
 
 TauSpinnerFilter::TauSpinnerFilter(const edm::ParameterSet& pset)
-    : src_(pset.getParameter<edm::InputTag>("src")), fRandomEngine(nullptr), ntaus_(0) {
+  : WTToken_(consumes<double>(pset.getParameter<edm::InputTag>("src"))), fRandomEngine(nullptr), ntaus_(0) {
   if (pset.getParameter<int>("ntaus") == 1)
     ntaus_ = 1.0;
   if (pset.getParameter<int>("ntaus") == 2)
     ntaus_ = 2.0;
-  WTToken_ = consumes<double>(src_);
 }
 
 bool TauSpinnerFilter::filter(edm::Event& e, edm::EventSetup const& es) {
   edm::RandomEngineSentry<TauSpinnerFilter> randomEngineSentry(this, e.streamID());
-  edm::Handle<double> WT;
-  e.getByToken(WTToken_, WT);
+  const edm::Handle<double> & WT = e.getHandle(WTToken_);
   if (*(WT.product()) >= 0 && *(WT.product()) <= 4.0) {
     double weight = (*(WT.product()));
     if (fRandomEngine->flat() * ntaus_ * 2.0 < weight) {