Merge pull request #31697 from makortel/esconsumesMixingModule

Migrate most of MixingModule and PreMixingModule to EventSetup consumes
cms-sw · Apr 30, 2021 · 87a7cf9 · 87a7cf9
2 parents d5801d3 + 7f1c3b1
commit 87a7cf9
Show file tree

Hide file tree

Showing 82 changed files with 809 additions and 871 deletions.
diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h
@@ -21,10 +21,9 @@
 class SiPixelGainCalibrationForHLTService final
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationForHLT, SiPixelGainCalibrationForHLTRcd> {
 public:
-  explicit SiPixelGainCalibrationForHLTService(const edm::ParameterSet& conf)
+  explicit SiPixelGainCalibrationForHLTService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
       : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationForHLT, SiPixelGainCalibrationForHLTRcd>(
-            conf){};
-  ~SiPixelGainCalibrationForHLTService() override{};
+            conf, std::move(iC)){};
 
   void calibrate(
       uint32_t detID, DigiIterator b, DigiIterator e, float conversionFactor, float offset, int* electron) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h
@@ -23,10 +23,9 @@ class SiPixelGainCalibrationForHLTSimService
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationForHLT,
                                                         SiPixelGainCalibrationForHLTSimRcd> {
 public:
-  explicit SiPixelGainCalibrationForHLTSimService(const edm::ParameterSet& conf)
+  explicit SiPixelGainCalibrationForHLTSimService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
       : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationForHLT, SiPixelGainCalibrationForHLTSimRcd>(
-            conf){};
-  ~SiPixelGainCalibrationForHLTSimService() override{};
+            conf, std::move(iC)){};
 
   // column granularity
   float getPedestal(const uint32_t& detID, const int& col, const int& row) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h
@@ -21,10 +21,9 @@
 class SiPixelGainCalibrationOfflineService
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationOffline, SiPixelGainCalibrationOfflineRcd> {
 public:
-  explicit SiPixelGainCalibrationOfflineService(const edm::ParameterSet& conf)
+  explicit SiPixelGainCalibrationOfflineService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
       : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationOffline, SiPixelGainCalibrationOfflineRcd>(
-            conf){};
-  ~SiPixelGainCalibrationOfflineService() override{};
+            conf, std::move(iC)){};
 
   // pixel granularity
   float getPedestal(const uint32_t& detID, const int& col, const int& row) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h
@@ -23,10 +23,8 @@ class SiPixelGainCalibrationOfflineSimService
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationOffline,
                                                         SiPixelGainCalibrationOfflineSimRcd> {
 public:
-  explicit SiPixelGainCalibrationOfflineSimService(const edm::ParameterSet& conf)
-      : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationOffline, SiPixelGainCalibrationOfflineSimRcd>(
-            conf){};
-  ~SiPixelGainCalibrationOfflineSimService() override{};
+  explicit SiPixelGainCalibrationOfflineSimService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
+      : SiPixelGainCalibrationServicePayloadGetter(conf, iC){};
 
   // pixel granularity
   float getPedestal(const uint32_t& detID, const int& col, const int& row) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h
@@ -21,9 +21,9 @@
 class SiPixelGainCalibrationService
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibration, SiPixelGainCalibrationRcd> {
 public:
-  explicit SiPixelGainCalibrationService(const edm::ParameterSet& conf)
-      : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibration, SiPixelGainCalibrationRcd>(conf){};
-  ~SiPixelGainCalibrationService() override{};
+  explicit SiPixelGainCalibrationService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
+      : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibration, SiPixelGainCalibrationRcd>(conf,
+                                                                                                      std::move(iC)){};
 
   // pixel granularity
   float getPedestal(const uint32_t& detID, const int& col, const int& row) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h
@@ -19,10 +19,11 @@
 
 // Framework
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
 // Abstract base class provides common interface to different payload getters
@@ -57,8 +58,7 @@ class SiPixelGainCalibrationServiceBase {
 template <class thePayloadObject, class theDBRecordType>
 class SiPixelGainCalibrationServicePayloadGetter : public SiPixelGainCalibrationServiceBase {
 public:
-  explicit SiPixelGainCalibrationServicePayloadGetter(const edm::ParameterSet& conf);
-  ~SiPixelGainCalibrationServicePayloadGetter() override{};
+  explicit SiPixelGainCalibrationServicePayloadGetter(const edm::ParameterSet& conf, edm::ConsumesCollector iC);
 
   //Abstract methods
   float getGain(const uint32_t& detID, const int& col, const int& row) override = 0;
@@ -94,7 +94,8 @@ class SiPixelGainCalibrationServicePayloadGetter : public SiPixelGainCalibration
 
   edm::ParameterSet conf_;
   bool ESetupInit_;
-  edm::ESHandle<thePayloadObject> ped;
+  const edm::ESGetToken<thePayloadObject, theDBRecordType> pedToken_;
+  const thePayloadObject* ped = nullptr;
   int numberOfRowsAveragedOver_;
   double gainLow_;
   double gainHigh_;
@@ -123,8 +124,8 @@ class SiPixelGainCalibrationServicePayloadGetter : public SiPixelGainCalibration
 
 template <class thePayloadObject, class theDBRecordType>
 SiPixelGainCalibrationServicePayloadGetter<thePayloadObject, theDBRecordType>::SiPixelGainCalibrationServicePayloadGetter(
-    const edm::ParameterSet& conf)
-    : conf_(conf), ESetupInit_(false) {
+    const edm::ParameterSet& conf, edm::ConsumesCollector iC)
+    : conf_(conf), ESetupInit_(false), pedToken_(iC.esConsumes()) {
   edm::LogInfo("SiPixelGainCalibrationServicePayloadGetter")
       << "[SiPixelGainCalibrationServicePayloadGetter::SiPixelGainCalibrationServicePayloadGetter]";
   // Initialize cache variables
@@ -145,7 +146,7 @@ SiPixelGainCalibrationServicePayloadGetter<thePayloadObject, theDBRecordType>::S
 template <class thePayloadObject, class theDBRecordType>
 void SiPixelGainCalibrationServicePayloadGetter<thePayloadObject, theDBRecordType>::setESObjects(
     const edm::EventSetup& es) {
-  es.get<theDBRecordType>().get(ped);
+  ped = &es.getData(pedToken_);
   // ped->initialize();  moved to cond infrastructure
   numberOfRowsAveragedOver_ = ped->getNumberOfRowsToAverageOver();
   ESetupInit_ = true;

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc
@@ -9,7 +9,7 @@ namespace cms {
       : conf_(conf),
         trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
         trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
-        SiPixelGainCalibrationForHLTService_(conf),
+        SiPixelGainCalibrationForHLTService_(conf, consumesCollector()),
         filename_(conf.getParameter<std::string>("fileName")) {}
 
   void SiPixelFakeGainForHLTReader::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc
@@ -7,7 +7,7 @@
 namespace cms {
   SiPixelFakeGainOfflineReader::SiPixelFakeGainOfflineReader(const edm::ParameterSet& conf)
       : conf_(conf),
-        SiPixelGainCalibrationOfflineService_(conf),
+        SiPixelGainCalibrationOfflineService_(conf, consumesCollector()),
         trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
         trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
         filename_(conf.getParameter<std::string>("fileName")) {}

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc
@@ -9,7 +9,7 @@ namespace cms {
       : conf_(conf),
         trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
         trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
-        SiPixelGainCalibrationService_(conf),
+        SiPixelGainCalibrationService_(conf, consumesCollector()),
         filename_(conf.getParameter<std::string>("fileName")) {}
 
   void SiPixelFakeGainReader::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {

diff --git a/CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.cc b/CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.cc
@@ -3,20 +3,21 @@
 #include "CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.h"
 
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 
 namespace cms {
-  SiPixelCondObjAllPayloadsReader::SiPixelCondObjAllPayloadsReader(const edm::ParameterSet& conf) : conf_(conf) {
+  SiPixelCondObjAllPayloadsReader::SiPixelCondObjAllPayloadsReader(const edm::ParameterSet& conf)
+      : conf_(conf), tkGeomToken_(esConsumes()) {
     std::string payloadType = conf.getParameter<std::string>("payloadType");
     if (strcmp(payloadType.c_str(), "HLT") == 0) {
-      SiPixelGainCalibrationService_ = new SiPixelGainCalibrationForHLTService(conf);
+      SiPixelGainCalibrationService_ = std::make_unique<SiPixelGainCalibrationForHLTService>(conf, consumesCollector());
     } else if (strcmp(payloadType.c_str(), "Offline") == 0) {
-      SiPixelGainCalibrationService_ = new SiPixelGainCalibrationOfflineService(conf);
+      SiPixelGainCalibrationService_ =
+          std::make_unique<SiPixelGainCalibrationOfflineService>(conf, consumesCollector());
     } else if (strcmp(payloadType.c_str(), "Full") == 0) {
-      SiPixelGainCalibrationService_ = new SiPixelGainCalibrationService(conf);
+      SiPixelGainCalibrationService_ = std::make_unique<SiPixelGainCalibrationService>(conf, consumesCollector());
     }
   }
 
@@ -36,7 +37,7 @@ namespace cms {
         << "[SiPixelCondObjAllPayloadsReader::beginJob] End Reading CondObjects" << std::endl;
 
     // Get the Geometry
-    iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
+    const TrackerGeometry* tkgeom = &iSetup.getData(tkGeomToken_);
     edm::LogInfo("SiPixelCondObjAllPayloadsReader")
         << " There are " << tkgeom->dets().size() << " detectors" << std::endl;
 
@@ -110,9 +111,6 @@ namespace cms {
         << "[SiPixelCondObjAllPayloadsReader::analyze] ---> PIXEL Channels " << nchannels << std::endl;
   }
 
-  // ------------ method called once each job just before starting event loop  ------------
-  void SiPixelCondObjAllPayloadsReader::beginJob() {}
-
   // ------------ method called once each job just after ending the event loop  ------------
   void SiPixelCondObjAllPayloadsReader::endJob() { std::cout << " ---> End job " << std::endl; }
 }  // namespace cms
diff --git a/CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.h b/CondTools/SiPixel/test/SiPixelCondObjAllPayloadsReader.h
@@ -22,11 +22,11 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 //#include "CondFormats/SiPixelObjects/interface/SiPixelGainCalibration.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h"
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h"
@@ -45,16 +45,14 @@ namespace cms {
   public:
     explicit SiPixelCondObjAllPayloadsReader(const edm::ParameterSet& iConfig);
 
-    ~SiPixelCondObjAllPayloadsReader(){};
-    virtual void beginJob();
     virtual void analyze(const edm::Event&, const edm::EventSetup&);
     virtual void endJob();
 
   private:
     edm::ParameterSet conf_;
-    edm::ESHandle<TrackerGeometry> tkgeom;
+    const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
     //edm::ESHandle<SiPixelGainCalibration> SiPixelGainCalibration_;
-    SiPixelGainCalibrationServiceBase* SiPixelGainCalibrationService_;
+    std::unique_ptr<SiPixelGainCalibrationServiceBase> SiPixelGainCalibrationService_;
 
     std::map<uint32_t, TH1F*> _TH1F_Pedestals_m;
     std::map<uint32_t, TH1F*> _TH1F_Gains_m;

diff --git a/CondTools/SiPixel/test/SiPixelCondObjBuilder.cc b/CondTools/SiPixel/test/SiPixelCondObjBuilder.cc
@@ -5,9 +5,7 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
@@ -17,8 +15,9 @@ namespace cms {
   SiPixelCondObjBuilder::SiPixelCondObjBuilder(const edm::ParameterSet& iConfig)
       : conf_(iConfig),
         appendMode_(conf_.getUntrackedParameter<bool>("appendMode", true)),
+        pddToken_(esConsumes()),
         SiPixelGainCalibration_(nullptr),
-        SiPixelGainCalibrationService_(iConfig),
+        SiPixelGainCalibrationService_(iConfig, consumesCollector()),
         recordName_(iConfig.getParameter<std::string>("record")),
         meanPed_(conf_.getParameter<double>("meanPed")),
         rmsPed_(conf_.getParameter<double>("rmsPed")),
@@ -52,8 +51,7 @@ namespace cms {
     float maxped = 255;
     SiPixelGainCalibration_ = new SiPixelGainCalibration(minped, maxped, mingain, maxgain);
 
-    edm::ESHandle<TrackerGeometry> pDD;
-    iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
+    const TrackerGeometry* pDD = &iSetup.getData(pddToken_);
     edm::LogInfo("SiPixelCondObjBuilder") << " There are " << pDD->dets().size() << " detectors" << std::endl;
 
     for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++) {

diff --git a/CondTools/SiPixel/test/SiPixelCondObjBuilder.h b/CondTools/SiPixel/test/SiPixelCondObjBuilder.h
@@ -22,11 +22,12 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 //#include "CondFormats/SiPixelObjects/interface/SiPixelGainCalibration.h"
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h"
 #include "CondFormats/SiPixelObjects/interface/PixelIndices.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include <string>
 
 namespace cms {
@@ -43,6 +44,7 @@ namespace cms {
   private:
     edm::ParameterSet conf_;
     bool appendMode_;
+    edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> pddToken_;
     SiPixelGainCalibration* SiPixelGainCalibration_;
     SiPixelGainCalibrationService SiPixelGainCalibrationService_;
     std::string recordName_;

diff --git a/CondTools/SiPixel/test/SiPixelCondObjForHLTBuilder.cc b/CondTools/SiPixel/test/SiPixelCondObjForHLTBuilder.cc
@@ -21,7 +21,7 @@ namespace cms {
       : conf_(iConfig),
         appendMode_(conf_.getUntrackedParameter<bool>("appendMode", true)),
         SiPixelGainCalibration_(nullptr),
-        SiPixelGainCalibrationService_(iConfig),
+        SiPixelGainCalibrationService_(iConfig, consumesCollector()),
         recordName_(iConfig.getParameter<std::string>("record")),
         meanPed_(conf_.getParameter<double>("meanPed")),
         rmsPed_(conf_.getParameter<double>("rmsPed")),

diff --git a/CondTools/SiPixel/test/SiPixelCondObjForHLTReader.cc b/CondTools/SiPixel/test/SiPixelCondObjForHLTReader.cc
@@ -3,7 +3,6 @@
 #include "CondTools/SiPixel/test/SiPixelCondObjForHLTReader.h"
 
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
@@ -12,11 +11,14 @@
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h"
 
 namespace cms {
-  SiPixelCondObjForHLTReader::SiPixelCondObjForHLTReader(const edm::ParameterSet& conf) : conf_(conf) {
+  SiPixelCondObjForHLTReader::SiPixelCondObjForHLTReader(const edm::ParameterSet& conf)
+      : conf_(conf), tkGeomToken_(esConsumes()) {
     if (conf_.getParameter<bool>("useSimRcd"))
-      SiPixelGainCalibrationService_ = new SiPixelGainCalibrationForHLTSimService(conf_);
+      SiPixelGainCalibrationService_ =
+          std::make_unique<SiPixelGainCalibrationForHLTSimService>(conf_, consumesCollector());
     else
-      SiPixelGainCalibrationService_ = new SiPixelGainCalibrationForHLTService(conf_);
+      SiPixelGainCalibrationService_ =
+          std::make_unique<SiPixelGainCalibrationForHLTService>(conf_, consumesCollector());
   }
 
   void SiPixelCondObjForHLTReader::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
@@ -37,7 +39,7 @@ namespace cms {
         << "[SiPixelCondObjForHLTReader::beginJob] End Reading CondObjForHLTects" << std::endl;
 
     // Get the Geometry
-    iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
+    const TrackerGeometry* tkgeom = &iSetup.getData(tkGeomToken_);
     edm::LogInfo("SiPixelCondObjForHLTReader") << " There are " << tkgeom->dets().size() << " detectors" << std::endl;
 
     // Get the list of DetId's
@@ -195,9 +197,6 @@ namespace cms {
               << _TH1F_Pedestals_fpix->GetRMS() << std::endl;
   }
 
-  // ------------ method called once each job just before starting event loop  ------------
-  void SiPixelCondObjForHLTReader::beginJob() {}
-
   // ------------ method called once each job just after ending the event loop  ------------
   void SiPixelCondObjForHLTReader::endJob() { std::cout << " ---> End job " << std::endl; }
 }  // namespace cms
diff --git a/CondTools/SiPixel/test/SiPixelCondObjForHLTReader.h b/CondTools/SiPixel/test/SiPixelCondObjForHLTReader.h
@@ -22,11 +22,11 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 //#include "CondFormats/SiPixelObjForHLTects/interface/SiPixelGainCalibration.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h"
 
 #include "TROOT.h"
@@ -40,16 +40,14 @@ namespace cms {
   public:
     explicit SiPixelCondObjForHLTReader(const edm::ParameterSet &iConfig);
 
-    ~SiPixelCondObjForHLTReader(){};
-    virtual void beginJob();
     virtual void analyze(const edm::Event &, const edm::EventSetup &);
     virtual void endJob();
 
   private:
     edm::ParameterSet conf_;
-    edm::ESHandle<TrackerGeometry> tkgeom;
     //edm::ESHandle<SiPixelGainCalibration> SiPixelGainCalibration_;
-    SiPixelGainCalibrationServiceBase *SiPixelGainCalibrationService_;
+    const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
+    std::unique_ptr<SiPixelGainCalibrationServiceBase> SiPixelGainCalibrationService_;
 
     std::map<uint32_t, TH1F *> _TH1F_Pedestals_m;
     std::map<uint32_t, TH1F *> _TH1F_Gains_m;