get rid of residual deprecation warnings in RecoLocalTracker/SiStripR…

…ecHitConverter and RecoTracker/TkMSParametrization

RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc

@@ -1,30 +1,41 @@
-#include "RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.h"
+// system include
 #include <iostream>
-#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
+
+// user includes
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+namespace edm {
+  class ParameterSet;
+}
+
+class ClusterFilter : public edm::stream::EDFilter<> {
+public:
+  ClusterFilter(const edm::ParameterSet&);
+  ~ClusterFilter() override = default;
+
+private:
+  bool filter(edm::Event&, edm::EventSetup const&);
+  const int nMax_;
+  const edm::EDGetTokenT<edm::DetSetVector<SiStripCluster>> clustersToken_;
+};
+
 using namespace std;
 using namespace edm;
 
-ClusterFilter::ClusterFilter(const ParameterSet& pset) : nMax_(pset.getParameter<int>("maxClusters")), conf_(pset) {}
-
-ClusterFilter::~ClusterFilter() {}
+ClusterFilter::ClusterFilter(const ParameterSet& pset)
+    : nMax_(pset.getParameter<int>("maxClusters")),
+      clustersToken_(consumes<edm::DetSetVector<SiStripCluster>>(pset.getParameter<std::string>("ClusterProducer"))) {}
 
 bool ClusterFilter::filter(Event& e, EventSetup const& es) {
-  std::string clusterProducer = conf_.getParameter<std::string>("ClusterProducer");
-  edm::Handle<edm::DetSetVector<SiStripCluster> > clusters;
-  e.getByLabel(clusterProducer, clusters);
-  //   int size=clusters.product()->size();
+  const edm::DetSetVector<SiStripCluster>& clusters = e.get(clustersToken_);
   int size = 0;
-  for (edm::DetSetVector<SiStripCluster>::const_iterator DSViter = clusters.product()->begin();
-       DSViter != clusters.product()->end();
-       ++DSViter) {
-    size += DSViter->data.size();
+  for (const auto& DSViter : clusters) {
+    size += DSViter.data.size();
   }
-
-  if (size > nMax_)
-    return 0;
-  else
-    return 1;
+  return (size < nMax_);
 }

RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc

@@ -1,41 +1,63 @@
-// File: ReadRecHit.cc
-// Description:  see ReadRecHit.h
-// Author:  C.Genta
-//
-//--------------------------------------------
+/** \class ReadRecHit
+ *
+ * ReadRecHit is a analyzer which reads rechits
+ *
+ * \author C. Genta
+ *
+ */
+
+// system includes
 #include <memory>
 #include <string>
 #include <iostream>
 
-#include "RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.h"
-
-#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"
+// user includes
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h"
-
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHitAlgorithm.h"
+
 namespace cms {
+  class ReadRecHit : public edm::one::EDAnalyzer<> {
+  public:
+    explicit ReadRecHit(const edm::ParameterSet& conf);
+    virtual ~ReadRecHit() override = default;
 
-  ReadRecHit::ReadRecHit(edm::ParameterSet const& conf) : readRecHitAlgorithm_(conf), conf_(conf) {
-    //    produces<SiStripRecHit2DCollection>();
-  }
+    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
+
+  private:
+    ReadRecHitAlgorithm readRecHitAlgorithm_;
+    const std::string recHitProducer_;
+    const edm::EDGetTokenT<SiStripMatchedRecHit2DCollection> matchedRecHitToken_;
+    const edm::EDGetTokenT<SiStripRecHit2DCollection> rphiToken_;
+    const edm::EDGetTokenT<SiStripRecHit2DCollection> stereoToken_;
+  };
+}  // namespace cms
+
+namespace cms {
 
-  // Virtual destructor needed.
-  ReadRecHit::~ReadRecHit() {}
+  ReadRecHit::ReadRecHit(edm::ParameterSet const& conf)
+      : readRecHitAlgorithm_(conf),
+        recHitProducer_(conf.getParameter<std::string>("RecHitProducer")),
+        matchedRecHitToken_(
+            consumes<SiStripMatchedRecHit2DCollection>(edm::InputTag{recHitProducer_, "matchedRecHit"})),
+        rphiToken_(consumes<SiStripRecHit2DCollection>(edm::InputTag{recHitProducer_, "rphiRecHit"})),
+        stereoToken_(consumes<SiStripRecHit2DCollection>(edm::InputTag{recHitProducer_, "stereoRecHit"})) {}
 
   // Functions that gets called by framework every event
   void ReadRecHit::analyze(const edm::Event& e, const edm::EventSetup& es) {
     using namespace edm;
-    std::string rechitProducer = conf_.getParameter<std::string>("RecHitProducer");
 
     // Step A: Get Inputs
-    edm::Handle<SiStripMatchedRecHit2DCollection> rechitsmatched;
-    edm::Handle<SiStripRecHit2DCollection> rechitsrphi;
-    edm::Handle<SiStripRecHit2DCollection> rechitsstereo;
-    e.getByLabel(rechitProducer, "matchedRecHit", rechitsmatched);
-    e.getByLabel(rechitProducer, "rphiRecHit", rechitsrphi);
-    e.getByLabel(rechitProducer, "stereoRecHit", rechitsstereo);
+    edm::Handle<SiStripMatchedRecHit2DCollection> rechitsmatched = e.getHandle(matchedRecHitToken_);
+    edm::Handle<SiStripRecHit2DCollection> rechitsrphi = e.getHandle(rphiToken_);
+    edm::Handle<SiStripRecHit2DCollection> rechitsstereo = e.getHandle(stereoToken_);
 
     edm::LogInfo("ReadRecHit") << "Matched hits:";
     readRecHitAlgorithm_.run(rechitsmatched.product());

RecoTracker/TkMSParametrization/test/TestMS.cc

@@ -1,17 +1,19 @@
+// system includes
+#include <iostream>
+
+// user includes
 #include "FWCore/Framework/interface/MakerMacros.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 "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-
 #include "RecoTracker/TkMSParametrization/interface/MultipleScatteringParametrisation.h"
 #include "RecoTracker/TkMSParametrization/interface/MultipleScatteringParametrisationMaker.h"
-
 #include "TrackingTools/DetLayers/interface/BarrelDetLayer.h"
 #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h"
 #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
@@ -20,28 +22,28 @@
 #include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-using namespace GeomDetEnumerators;
-
-#include <iostream>
-
-using namespace std;
-using namespace edm;
 
+// ROOT includes
 #include "TFile.h"
 #include "TH1D.h"
 #include "TProfile.h"
 
+using namespace GeomDetEnumerators;
+using namespace std;
+using namespace edm;
+
 template <class T>
 T sqr(T t) {
   return t * t;
 }
 
-class TestMS : public edm::EDAnalyzer {
+class TestMS : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
 public:
   explicit TestMS(const edm::ParameterSet& conf);
   ~TestMS();
   virtual void beginRun(edm::Run const& run, const edm::EventSetup& es) override;
   virtual void analyze(const edm::Event& ev, const edm::EventSetup& es) override;
+  virtual void endRun(edm::Run const& run, const edm::EventSetup& es){};
 
 private:
   edm::ESGetToken<GeometricSearchTracker, TrackerRecoGeometryRecord> trackerToken_;