Merge pull request #36242 from bsunanda/Run3-gex99C

Run3-gex99C Use ESGetToken in RecoHI/HiTracking
cms-sw · Nov 26, 2021 · 3b25867 · 3b25867
2 parents d8a420f + 51816aa
commit 3b25867
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/RecoHI/HiTracking/plugins/HIBestVertexProducer.cc b/RecoHI/HiTracking/plugins/HIBestVertexProducer.cc
@@ -1,7 +1,6 @@
 #include "RecoHI/HiTracking/interface/HIBestVertexProducer.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"

diff --git a/RecoHI/HiTracking/plugins/HIMultiTrackSelector.cc b/RecoHI/HiTracking/plugins/HIMultiTrackSelector.cc
@@ -4,7 +4,6 @@
 #include "DataFormats/Common/interface/ValueMap.h"
 #include "CondFormats/DataRecord/interface/GBRWrapperRcd.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include <Math/DistFunc.h>
 #include <TMath.h>

diff --git a/RecoHI/HiTracking/plugins/HIPixelMedianVtxProducer.cc b/RecoHI/HiTracking/plugins/HIPixelMedianVtxProducer.cc
@@ -1,7 +1,6 @@
 #include "HIPixelMedianVtxProducer.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
 

diff --git a/RecoHI/HiTracking/plugins/HIProtoTrackFilterProducer.cc b/RecoHI/HiTracking/plugins/HIProtoTrackFilterProducer.cc
@@ -10,7 +10,6 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackFilter.h"
 #include "RecoHI/HiTracking/interface/HIProtoTrackFilter.h"

diff --git a/RecoHI/HiTracking/plugins/HITrackingRegionProducer.h b/RecoHI/HiTracking/plugins/HITrackingRegionProducer.h
@@ -9,7 +9,6 @@
 #include "RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"

diff --git a/RecoHI/HiTracking/src/HICaloCompatibleTrackSelector.cc b/RecoHI/HiTracking/src/HICaloCompatibleTrackSelector.cc
@@ -18,7 +18,6 @@
 #include "RecoHI/HiTracking/interface/HICaloCompatibleTrackSelector.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DataFormats/Math/interface/deltaR.h"
 #include <Math/DistFunc.h>

diff --git a/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc b/RecoHI/HiTracking/test/HIPixelClusterVtxAnalyzer.cc
@@ -1,13 +1,11 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/Event.h"
-
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
@@ -43,20 +41,22 @@ class HIPixelClusterVtxAnalyzer : public edm::EDAnalyzer {
   virtual void analyze(const edm::Event &ev, const edm::EventSetup &es);
   int getContainedHits(const std::vector<VertexHit> &hits, double z0, double &chi);
 
-  edm::EDGetTokenT<SiPixelRecHitCollection> srcPixels_;  //pixel rec hits
+  const edm::EDGetTokenT<SiPixelRecHitCollection> srcPixels_;  //pixel rec hits
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerToken_;
 
-  double minZ_;
-  double maxZ_;
-  double zStep_;
+  const double minZ_;
+  const double maxZ_;
+  const double zStep_;
+  const int maxHists_;
 
   edm::Service<TFileService> fs;
-  int maxHists_;
   int counter;
 };
 
 /*****************************************************************************/
 HIPixelClusterVtxAnalyzer::HIPixelClusterVtxAnalyzer(const edm::ParameterSet &ps)
     : srcPixels_(consumes<SiPixelRecHitCollection>(ps.getParameter<edm::InputTag>("pixelRecHits"))),
+      trackerToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
       minZ_(ps.getParameter<double>("minZ")),
       maxZ_(ps.getParameter<double>("maxZ")),
       zStep_(ps.getParameter<double>("zStep")),
@@ -90,8 +90,7 @@ void HIPixelClusterVtxAnalyzer::analyze(const edm::Event &ev, const edm::EventSe
 
   // get tracker geometry
   if (hRecHits.isValid()) {
-    edm::ESHandle<TrackerGeometry> trackerHandle;
-    es.get<TrackerDigiGeometryRecord>().get(trackerHandle);
+    const auto &trackerHandle = es.getHandle(trackerToken_);
     const TrackerGeometry *tgeo = trackerHandle.product();
     const SiPixelRecHitCollection *hits = hRecHits.product();