get rid of CMS deprecation warnings in Alignment/TrackerAlignment

Alignment/TrackerAlignment/test/ApeAdder.cpp

@@ -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/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -33,10 +33,10 @@
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 // Class declaration
-class ApeAdder : public edm::EDAnalyzer {
+class ApeAdder : public edm::one::EDAnalyzer<> {
 public:
   explicit ApeAdder(const edm::ParameterSet&);
-  ~ApeAdder(){};
+  ~ApeAdder() override = default;
 
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
@@ -46,11 +46,14 @@ class ApeAdder : public edm::EDAnalyzer {
 
 private:
   // members
+  const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
   std::string theErrorRecordName;
   std::vector<double> theApe;  // Amount of APE to add (from config.)
 };
 
-ApeAdder::ApeAdder(const edm::ParameterSet& iConfig) : theErrorRecordName("TrackerAlignmentErrorExtendedRcd") {
+ApeAdder::ApeAdder(const edm::ParameterSet& iConfig)
+    : tTopoToken_(esConsumes()), tkGeomToken_(esConsumes()), theErrorRecordName("TrackerAlignmentErrorExtendedRcd") {
   // The APE to set to all GeomDets
   theApe = iConfig.getUntrackedParameter<std::vector<double> >("apeVector");
 }
@@ -60,13 +63,9 @@ void ApeAdder::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
 
 {
   //Retrieve tracker topology from geometry
-  edm::ESHandle<TrackerTopology> tTopoHandle;
-  iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-
+  const TrackerTopology* const tTopo = &iSetup.getData(tTopoToken_);
   // Get geometry from ES
-  edm::ESHandle<TrackerGeometry> trackerGeometry;
-  iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometry);
+  const TrackerGeometry* trackerGeometry = &iSetup.getData(tkGeomToken_);
 
   // Create the alignable hierarchy
   AlignableTracker* theAlignableTracker = new AlignableTracker(&(*trackerGeometry), tTopo);

Alignment/TrackerAlignment/test/TestAnalyzer.cpp

@@ -19,7 +19,7 @@
 
 // user include files
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -37,7 +37,7 @@
 // class declaration
 //
 
-class TestAnalyzer : public edm::EDAnalyzer {
+class TestAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit TestAnalyzer(const edm::ParameterSet&);
   ~TestAnalyzer();
@@ -46,6 +46,7 @@ class TestAnalyzer : public edm::EDAnalyzer {
 
 private:
   // ----------member data ---------------------------
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
   TTree* theTree;
   TFile* theFile;
   float x_, y_, z_, phi_, theta_, length_, thick_, width_;
@@ -56,7 +57,7 @@ class TestAnalyzer : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-TestAnalyzer::TestAnalyzer(const edm::ParameterSet& iConfig) {
+TestAnalyzer::TestAnalyzer(const edm::ParameterSet& iConfig) : tkGeomToken_(esConsumes()) {
   // Open root file and define tree
   std::string fileName = iConfig.getUntrackedParameter<std::string>("fileName", "test.root");
   theFile = new TFile(fileName.c_str(), "RECREATE");
@@ -86,8 +87,7 @@ void TestAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet
   //
   // Retrieve tracker geometry from event setup
   //
-  edm::ESHandle<TrackerGeometry> trackerGeometry;
-  iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometry);
+  const TrackerGeometry* trackerGeometry = &iSetup.getData(tkGeomToken_);
 
   // Now loop on detector units, and store position and orientation
   for (auto iGeomDet = trackerGeometry->dets().begin(); iGeomDet != trackerGeometry->dets().end(); iGeomDet++) {

Alignment/TrackerAlignment/test/TestReader.cpp

@@ -12,7 +12,7 @@
 #include <TRotMatrix.h>
 
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -29,14 +29,16 @@
 // class declaration
 //
 
-class TestTrackerReader : public edm::EDAnalyzer {
+class TestTrackerReader : public edm::one::EDAnalyzer<> {
 public:
-  explicit TestTrackerReader(const edm::ParameterSet&) : rot(0) {}
+  explicit TestTrackerReader(const edm::ParameterSet&) : aliToken_(esConsumes()), aliErrToken_(esConsumes()), rot(0) {}
 
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
 private:
   // ----------member data ---------------------------
+  const edm::ESGetToken<Alignments, TrackerAlignmentRcd> aliToken_;
+  const edm::ESGetToken<AlignmentErrorsExtended, TrackerAlignmentErrorExtendedRcd> aliErrToken_;
   float x, y, z, phi, theta, length, thick, width;
   TRotMatrix* rot;
 };
@@ -45,10 +47,8 @@ void TestTrackerReader::analyze(const edm::Event& iEvent, const edm::EventSetup&
   edm::LogInfo("TrackerAlignment") << "Starting!";
 
   // Retrieve alignment[Error]s from DBase
-  edm::ESHandle<Alignments> alignments;
-  iSetup.get<TrackerAlignmentRcd>().get(alignments);
-  edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);
+  const Alignments* alignments = &iSetup.getData(aliToken_);
+  const AlignmentErrorsExtended* alignmentErrors = &iSetup.getData(aliErrToken_);
 
   edm::LogVerbatim("DumpAlignments") << "\n----------------------\n";
   for (std::vector<AlignTransform>::const_iterator it = alignments->m_align.begin(); it != alignments->m_align.end();

Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp

@@ -17,7 +17,7 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -39,15 +39,24 @@ static const int kLEAD_WIDTH = 40;  // First field width
 // class declaration
 //
 
-class TestTrackerHierarchy : public edm::EDAnalyzer {
+class TestTrackerHierarchy : public edm::one::EDAnalyzer<> {
 public:
   explicit TestTrackerHierarchy(const edm::ParameterSet& pSet)
-      : dumpAlignments_(pSet.getUntrackedParameter<bool>("dumpAlignments")) {}
+      : tTopoToken_(esConsumes()),
+        tkGeomToken_(esConsumes()),
+        aliToken_(esConsumes()),
+        aliErrToken_(esConsumes()),
+        dumpAlignments_(pSet.getUntrackedParameter<bool>("dumpAlignments")) {}
 
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
 private:
   // ----------member data ---------------------------
+  const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
+  const edm::ESGetToken<Alignments, TrackerAlignmentRcd> aliToken_;
+  const edm::ESGetToken<AlignmentErrorsExtended, TrackerAlignmentErrorExtendedRcd> aliErrToken_;
+
   void dumpAlignable(const Alignable*, unsigned int, unsigned int);
   void printInfo(const Alignable*, unsigned int);
   void dumpAlignments(const edm::EventSetup& setup, AlignableTracker* aliTracker) const;
@@ -60,13 +69,10 @@ class TestTrackerHierarchy : public edm::EDAnalyzer {
 
 void TestTrackerHierarchy::analyze(const edm::Event&, const edm::EventSetup& setup) {
   //Retrieve tracker topology from geometry
-  edm::ESHandle<TrackerTopology> tTopoHandle;
-  setup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-
+  const TrackerTopology* const tTopo = &setup.getData(tTopoToken_);
   edm::LogInfo("TrackerHierarchy") << "Starting!";
-  edm::ESHandle<TrackerGeometry> trackerGeometry;
-  setup.get<TrackerDigiGeometryRecord>().get(trackerGeometry);
+
+  const TrackerGeometry* trackerGeometry = &setup.getData(tkGeomToken_);
   alignableTracker_ = std::make_unique<AlignableTracker>(&(*trackerGeometry), tTopo);
 
   leaders_ = "";
@@ -126,8 +132,7 @@ void TestTrackerHierarchy::printInfo(const Alignable* alignable, unsigned int id
 
 //__________________________________________________________________________________________________
 void TestTrackerHierarchy::dumpAlignments(const edm::EventSetup& setup, AlignableTracker* aliTracker) const {
-  edm::ESHandle<Alignments> alignments;
-  setup.get<TrackerAlignmentRcd>().get(alignments);
+  const Alignments* alignments = &setup.getData(aliToken_);
   if (alignments->empty()) {
     edm::LogWarning("TrackerAlignment") << "@SUB=dumpAlignments"
                                         << "No TrackerAlignmentRcd.";

Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc

@@ -26,10 +26,13 @@
 
 //_____________________________________________________________________________
 TrackerGeometryAnalyzer ::TrackerGeometryAnalyzer(const edm::ParameterSet& config)
-    : analyzeAlignables_(config.getParameter<bool>("analyzeAlignables")),
+    : tTopoToken_(esConsumes()),
+      geomDetToken_(esConsumes()),
+      ptpToken_(esConsumes()),
+      ptapToken_(esConsumes()),
+      analyzeAlignables_(config.getParameter<bool>("analyzeAlignables")),
       printTrackerStructure_(config.getParameter<bool>("printTrackerStructure")),
       maxPrintDepth_(config.getParameter<int>("maxPrintDepth")),
-
       analyzeGeometry_(config.getParameter<bool>("analyzeGeometry")),
       analyzePXB_(config.getParameter<bool>("analyzePXB")),
       analyzePXE_(config.getParameter<bool>("analyzePXE")),
@@ -63,22 +66,14 @@ void TrackerGeometryAnalyzer ::beginRun(const edm::Run& /* run */, const edm::Ev
 
 //_____________________________________________________________________________
 void TrackerGeometryAnalyzer ::setTrackerTopology(const edm::EventSetup& setup) {
-  edm::ESHandle<TrackerTopology> trackerTopologyHandle;
-  setup.get<TrackerTopologyRcd>().get(trackerTopologyHandle);
-
-  trackerTopology = trackerTopologyHandle.product();
+  trackerTopology = &setup.getData(tTopoToken_);
 }
 
 //_____________________________________________________________________________
 void TrackerGeometryAnalyzer ::setTrackerGeometry(const edm::EventSetup& setup) {
-  edm::ESHandle<GeometricDet> geometricDet;
-  setup.get<IdealGeometryRecord>().get(geometricDet);
-
-  edm::ESHandle<PTrackerParameters> trackerParams;
-  setup.get<PTrackerParametersRcd>().get(trackerParams);
-
-  edm::ESHandle<PTrackerAdditionalParametersPerDet> trackerGeometricDetExtra;
-  setup.get<PTrackerAdditionalParametersPerDetRcd>().get(trackerGeometricDetExtra);
+  edm::ESHandle<GeometricDet> geometricDet = setup.getHandle(geomDetToken_);
+  edm::ESHandle<PTrackerParameters> trackerParams = setup.getHandle(ptpToken_);
+  edm::ESHandle<PTrackerAdditionalParametersPerDet> trackerGeometricDetExtra = setup.getHandle(ptapToken_);
 
   TrackerGeomBuilderFromGeometricDet trackerGeometryBuilder;
   trackerGeometry =

Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h

@@ -10,28 +10,36 @@
 #include <sstream>
 
 // core framework functionality
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 // topology and geometry
+#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h"
+#include "Geometry/Records/interface/PTrackerParametersRcd.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
 
 // alignment
 #include "Alignment/CommonAlignment/interface/AlignableObjectId.h"
 
 class Alignable;
 
-class TrackerGeometryAnalyzer : public edm::EDAnalyzer {
+class TrackerGeometryAnalyzer : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   //========================== PUBLIC METHODS =================================
 public:  //===================================================================
   TrackerGeometryAnalyzer(const edm::ParameterSet&);
   virtual ~TrackerGeometryAnalyzer(){};
 
   virtual void beginRun(const edm::Run&, const edm::EventSetup&) override;
   virtual void analyze(const edm::Event&, const edm::EventSetup&) override{};
+  virtual void endRun(const edm::Run&, const edm::EventSetup&) override{};
 
   //========================= PRIVATE METHODS =================================
 private:  //==================================================================
@@ -62,6 +70,12 @@ class TrackerGeometryAnalyzer : public edm::EDAnalyzer {
   //========================== PRIVATE DATA ===================================
   //===========================================================================
 
+  // ESTokens
+  const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
+  const edm::ESGetToken<GeometricDet, IdealGeometryRecord> geomDetToken_;
+  const edm::ESGetToken<PTrackerParameters, PTrackerParametersRcd> ptpToken_;
+  const edm::ESGetToken<PTrackerAdditionalParametersPerDet, PTrackerAdditionalParametersPerDetRcd> ptapToken_;
+
   // config-file parameters
   const bool analyzeAlignables_;
   const bool printTrackerStructure_;