get rid of deprecation warnings from RecoVertex subsystem

RecoVertex/AdaptiveVertexFinder/interface/TracksClusteringFromDisplacedSeed.h

@@ -1,6 +1,5 @@
 #include <memory>
 
-#include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Utilities/interface/InputTag.h"

RecoVertex/AdaptiveVertexFinder/interface/VertexMerging.h

@@ -1,7 +1,6 @@
 #include <memory>
 #include <set>
 
-#include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Utilities/interface/InputTag.h"

RecoVertex/ConfigurableVertexReco/test/CVRTest.cc

@@ -1,4 +1,7 @@
-#include <vector>
+// user includes
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "RecoVertex/ConfigurableVertexReco/interface/ConfigurableVertexReconstructor.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -8,12 +11,35 @@
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
-#include "RecoVertex/ConfigurableVertexReco/test/CVRTest.h"
-
 #include "DataFormats/Provenance/interface/RunLumiEventNumber.h"
 
+// system includes
+#include <vector>
 #include <iostream>
 
+class CVRTest : public edm::one::EDAnalyzer<> {
+  /**
+   *  Class that glues the combined btagging algorithm to the framework
+   */
+public:
+  explicit CVRTest(const edm::ParameterSet&);
+  ~CVRTest();
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  void discussPrimary(const edm::Event&) const;
+
+private:
+  const edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> estoken_ttk;
+  const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> estoken_mf;
+
+  ConfigurableVertexReconstructor* vrec_;
+  std::string trackcoll_;
+  std::string vertexcoll_;
+  std::string beamspot_;
+};
+
 using namespace std;
 using namespace reco;
 using namespace edm;
@@ -56,7 +82,9 @@ namespace {
 }  // namespace
 
 CVRTest::CVRTest(const edm::ParameterSet& iconfig)
-    : trackcoll_(iconfig.getParameter<string>("trackcoll")),
+    : estoken_ttk(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))),
+      estoken_mf(esConsumes()),
+      trackcoll_(iconfig.getParameter<string>("trackcoll")),
       vertexcoll_(iconfig.getParameter<string>("vertexcoll")),
       beamspot_(iconfig.getParameter<string>("beamspot")) {
   edm::ParameterSet vtxconfig = iconfig.getParameter<edm::ParameterSet>("vertexreco");
@@ -81,10 +109,8 @@ void CVRTest::discussPrimary(const edm::Event& iEvent) const {
 void CVRTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   edm::EventNumber_t const evt = iEvent.id().event();
   cout << "[CVRTest] next event: " << evt << endl;
-  edm::ESHandle<MagneticField> magneticField;
-  iSetup.get<IdealMagneticFieldRecord>().get(magneticField);
-  edm::ESHandle<TransientTrackBuilder> builder;
-  iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", builder);
+  edm::ESHandle<MagneticField> magneticField = iSetup.getHandle(estoken_mf);
+  edm::ESHandle<TransientTrackBuilder> builder = iSetup.getHandle(estoken_ttk);
 
   edm::Handle<reco::TrackCollection> tks;
   iEvent.getByLabel(trackcoll_, tks);

RecoVertex/GaussianSumVertexFit/test/GsfTest.cc

@@ -1,30 +1,83 @@
-#include "RecoVertex/GaussianSumVertexFit/test/GsfTest.h"
+// -*- C++ -*-
+//
+// Package:    GsfTest
+// Class:      GsfTest
+//
+/**\class GsfTest GsfTest.cc RecoVertex/GsfTest/src/GsfTest.cc
 
-#include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
+ Description: steers tracker primary vertex reconstruction and storage
+
+ Implementation:
+     <Notes on implementation>
+*/
+
+// system include files
+#include <memory>
+#include <iostream>
+
+// user include files
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
-#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/VertexReco/interface/Vertex.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.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"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-
-#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
-#include "TrackingTools/Records/interface/TransientTrackRecord.h"
-#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
-#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h"
-#include "RecoVertex/GaussianSumVertexFit/interface/GsfVertexFitter.h"
-#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "RecoVertex/GaussianSumVertexFit/interface/GsfVertexFitter.h"
+#include "RecoVertex/KalmanVertexFit/interface/KalmanVertexFitter.h"
+#include "RecoVertex/KalmanVertexFit/interface/SimpleVertexTree.h"
+#include "RecoVertex/VertexPrimitives/interface/TransientVertex.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertex.h"
+#include "TrackingTools/Records/interface/TransientTrackRecord.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 
-#include <iostream>
+#include <TFile.h>
+
+/**
+   * This is a very simple test analyzer mean to test the KalmanVertexFitter
+   */
+
+class GsfTest : public edm::one::EDAnalyzer<> {
+public:
+  explicit GsfTest(const edm::ParameterSet&);
+  ~GsfTest();
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  TrackingVertex getSimVertex(const edm::Event& iEvent) const;
+
+  const edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> estoken_ttk;
+  const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> estoken_mf;
+
+  edm::ParameterSet gsfPSet;
+
+  std::unique_ptr<SimpleVertexTree> tree;
+  TFile* rootFile_;
+
+  std::string outputFile_;  // output file
+  edm::EDGetTokenT<reco::TrackCollection> token_tracks;
+  //   edm::EDGetTokenT<TrackingParticleCollection> token_TrackTruth;
+  edm::EDGetTokenT<TrackingVertexCollection> token_VertexTruth;
+};
 
 using namespace reco;
 using namespace edm;
 using namespace std;
 
-GsfTest::GsfTest(const edm::ParameterSet& iConfig) : theConfig(iConfig) {
+GsfTest::GsfTest(const edm::ParameterSet& iConfig)
+    : estoken_ttk(esConsumes(edm::ESInputTag("", "TransientTrackBuilder"))), estoken_mf(esConsumes()) {
   token_tracks = consumes<TrackCollection>(iConfig.getParameter<string>("TrackLabel"));
   outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile");
   gsfPSet = iConfig.getParameter<edm::ParameterSet>("GsfParameters");
@@ -36,19 +89,14 @@ GsfTest::GsfTest(const edm::ParameterSet& iConfig) : theConfig(iConfig) {
 
 GsfTest::~GsfTest() { delete rootFile_; }
 
-void GsfTest::beginJob() {}
-
-void GsfTest::endJob() {}
-
 //
 // member functions
 //
 
 void GsfTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   if (not tree) {
-    edm::ESHandle<MagneticField> magField;
-    iSetup.get<IdealMagneticFieldRecord>().get(magField);
-    tree.reset(new SimpleVertexTree("VertexFitter", magField.product()));
+    const MagneticField* magField = &iSetup.getData(estoken_mf);
+    tree.reset(new SimpleVertexTree("VertexFitter", magField));
   }
 
   try {
@@ -66,8 +114,7 @@ void GsfTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
     // Transform Track to TransientTrack
 
     //get the builder:
-    edm::ESHandle<TransientTrackBuilder> theB;
-    iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", theB);
+    edm::ESHandle<TransientTrackBuilder> theB = iSetup.getHandle(estoken_ttk);
     //do the conversion:
     vector<TransientTrack> t_tks = (*theB).build(tks);
 
@@ -131,3 +178,5 @@ TrackingVertex GsfTest::getSimVertex(const edm::Event& iEvent) const {
   //    }
   return *(tPC.begin());
 }
+
+DEFINE_FWK_MODULE(GsfTest);