added esConsumes to modules in RecoTracker/DeDx

cms-sw · Jul 15, 2020 · c304c24 · c304c24
1 parent 4227922
commit c304c24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.cc b/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.cc
@@ -44,6 +44,7 @@ DeDxHitInfoProducer::DeDxHitInfoProducer(const edm::ParameterSet& iConfig)
   produces<edm::ValueMap<int>>("prescale");
 
   m_tracksTag = consumes<reco::TrackCollection>(iConfig.getParameter<edm::InputTag>("tracks"));
+  m_tkGeomToken = esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>();
 
   if (!usePixel && !useStrip)
     edm::LogError("DeDxHitsProducer") << "No Pixel Hits NOR Strip Hits will be saved.  Running this module is useless";
@@ -53,7 +54,7 @@ DeDxHitInfoProducer::~DeDxHitInfoProducer() {}
 
 // ------------ method called once each job just before starting event loop  ------------
 void DeDxHitInfoProducer::beginRun(edm::Run const& run, const edm::EventSetup& iSetup) {
-  iSetup.get<TrackerDigiGeometryRecord>().get(tkGeom);
+  tkGeom = iSetup.getHandle(m_tkGeomToken);
   if (useCalibration && calibGains.empty()) {
     m_off = tkGeom->offsetDU(GeomDetEnumerators::PixelBarrel);  //index start at the first pixel
 

diff --git a/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.h b/RecoTracker/DeDx/plugins/DeDxHitInfoProducer.h
@@ -10,6 +10,7 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
@@ -73,6 +74,7 @@ class DeDxHitInfoProducer : public edm::stream::EDProducer<> {
   unsigned int m_off;
 
   edm::ESHandle<TrackerGeometry> tkGeom;
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> m_tkGeomToken;
 
   uint64_t xorshift128p(uint64_t state[2]) {
     uint64_t x = state[0];