cms-sw · cmsbuild · Dec 3, 2020 · Nov 3, 2020 · Nov 3, 2020 · Nov 3, 2020
diff --git a/CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h b/CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h
@@ -1,9 +1,12 @@
 #ifndef SiPixelFedCablingMapBuilder_H
 #define SiPixelFedCablingMapBuilder_H
 
-#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
-#include "DataFormats/DetId/interface/DetId.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include <vector>
 #include <string>
@@ -14,7 +17,7 @@ class PixelGeomDetUnit;
 class SiPixelFedCablingMapBuilder {
 public:
   //SiPixelFedCablingMapBuilder(const std::string & associatorName);
-  SiPixelFedCablingMapBuilder(const std::string fileName, const bool phase1 = false);
+  SiPixelFedCablingMapBuilder(edm::ConsumesCollector&& iCC, const std::string fileName, const bool phase1 = false);
   SiPixelFedCablingTree* produce(const edm::EventSetup& setup);
 
 private:
@@ -27,6 +30,9 @@ class SiPixelFedCablingMapBuilder {
   std::string fileName_;
   std::string myprint(const PixelGeomDetUnit* pxUnit);
   bool phase1_;
+
+  edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> trackerTopoToken_;
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomToken_;
 };
 
 #endif
diff --git a/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc b/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
@@ -1,11 +1,8 @@
 #include <iostream>
 
 #include "CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include <ostream>
 #include "DataFormats/TrackerCommon/interface/PixelEndcapName.h"
@@ -30,16 +27,19 @@
 using namespace std;
 using namespace sipixelobjects;
 
-SiPixelFedCablingMapBuilder::SiPixelFedCablingMapBuilder(const string fileName,
+SiPixelFedCablingMapBuilder::SiPixelFedCablingMapBuilder(edm::ConsumesCollector&& iCC,
+                                                         const string fileName,
                                                          const bool phase1)
     : fileName_(fileName)  //, phase1_(phase1) not used anymore
-{}
+{
+  trackerTopoToken_ = iCC.esConsumes<TrackerTopology, TrackerTopologyRcd>();
+  trackerGeomToken_ = iCC.esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>();
+}
 
 SiPixelFedCablingTree* SiPixelFedCablingMapBuilder::produce(const edm::EventSetup& setup) {
   // Access geometry
   edm::LogInfo("read tracker geometry...");
-  edm::ESHandle<TrackerGeometry> pDD;
-  setup.get<TrackerDigiGeometryRecord>().get(pDD);
+  edm::ESHandle<TrackerGeometry> pDD = setup.getHandle(trackerGeomToken_);
   edm::LogInfo("tracker geometry read") << "There are: " << pDD->dets().size() << " detectors";
 
   // Test new TrackerGeometry features
@@ -86,8 +86,7 @@ SiPixelFedCablingTree* SiPixelFedCablingMapBuilder::produce(const edm::EventSetu
   edm::LogInfo(" version ") << version << endl;
 
   // Access topology
-  edm::ESHandle<TrackerTopology> tTopo;
-  setup.get<TrackerTopologyRcd>().get(tTopo);
+  edm::ESHandle<TrackerTopology> tTopo = setup.getHandle(trackerTopoToken_);
   const TrackerTopology* tt = tTopo.product();
 
   typedef TrackerGeometry::DetContainer::const_iterator ITG;

diff --git a/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter.cc b/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter.cc
@@ -61,7 +61,7 @@ void SiPixelFedCablingMapWriter::analyze(const edm::Event& iEvent, const edm::Ev
     //std::cout << "-------HERE-----------" << endl;
     //cabling = SiPixelFedCablingMapBuilder(pixelToFedAssociator_).produce(iSetup);
     //cabling = SiPixelFedCablingMapBuilder(fileName_,phase1_).produce(iSetup);
-    cabling = SiPixelFedCablingMapBuilder(fileName_).produce(iSetup);
+    cabling = SiPixelFedCablingMapBuilder(consumesCollector(), fileName_).produce(iSetup);
     //std::cout << "-------Print Map ----------- DOES NOT WORK for phase1 " << endl;
     edm::LogInfo("PRINTING MAP (Does not work for phase1: ") << cabling->print(3);
   }

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelDetInfoFileWriter.h b/CalibTracker/SiPixelESProducers/interface/SiPixelDetInfoFileWriter.h
@@ -19,6 +19,8 @@
 //
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include <string>
 #include <iostream>
 #include <fstream>
@@ -34,6 +36,7 @@ class SiPixelDetInfoFileWriter : public edm::EDAnalyzer {
   void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomTokenBeginRun_;
   std::ofstream outputFile_;
   std::string filePath_;
 };

diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc
@@ -6,11 +6,8 @@
 
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelDetInfoFileWriter.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
@@ -21,6 +18,7 @@ using namespace std;
 SiPixelDetInfoFileWriter::SiPixelDetInfoFileWriter(const edm::ParameterSet &iConfig) {
   edm::LogInfo("SiPixelDetInfoFileWriter::SiPixelDetInfoFileWriter");
 
+  trackerGeomTokenBeginRun_ = esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>();
   filePath_ = iConfig.getUntrackedParameter<std::string>("FilePath", std::string("SiPixelDetInfo.dat"));
 }
 
@@ -32,9 +30,7 @@ void SiPixelDetInfoFileWriter::beginRun(const edm::Run &run, const edm::EventSet
   outputFile_.open(filePath_.c_str());
 
   if (outputFile_.is_open()) {
-    edm::ESHandle<TrackerGeometry> pDD;
-
-    iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
+    edm::ESHandle<TrackerGeometry> pDD = iSetup.getHandle(trackerGeomTokenBeginRun_);
 
     edm::LogInfo("SiPixelDetInfoFileWriter::beginJob - got geometry  ") << std::endl;
     edm::LogInfo("SiPixelDetInfoFileWriter") << " There are " << pDD->detUnits().size() << " detectors" << std::endl;

diff --git a/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc b/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc
@@ -2,12 +2,9 @@
 #include <iostream>
 #include <map>
 #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/MakerMacros.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/SiPixelDetId/interface/PixelFEDChannel.h"
 #include "CalibTracker/Records/interface/SiPixelFEDChannelContainerESProducerRcd.h"
 
@@ -25,11 +22,15 @@ class PixelFEDChannelCollectionMapTestReader : public edm::one::EDAnalyzer<> {
   // ----------member data ---------------------------
   const bool printdebug_;
   const std::string formatedOutput_;
+  edm::ESGetToken<PixelFEDChannelCollectionMap, SiPixelFEDChannelContainerESProducerRcd>
+      pixelFEDChannelCollectionMapToken_;
 };
 
 PixelFEDChannelCollectionMapTestReader::PixelFEDChannelCollectionMapTestReader(edm::ParameterSet const& p)
     : printdebug_(p.getUntrackedParameter<bool>("printDebug", true)),
-      formatedOutput_(p.getUntrackedParameter<std::string>("outputFile", "")) {
+      formatedOutput_(p.getUntrackedParameter<std::string>("outputFile", "")),
+      pixelFEDChannelCollectionMapToken_(
+          esConsumes<PixelFEDChannelCollectionMap, SiPixelFEDChannelContainerESProducerRcd>()) {
   edm::LogInfo("PixelFEDChannelCollectionMapTestReader") << "PixelFEDChannelCollectionMapTestReader" << std::endl;
 }
 
@@ -53,11 +54,9 @@ void PixelFEDChannelCollectionMapTestReader::analyze(const edm::Event& e, const
   }
 
   //this part gets the handle of the event source and the record (i.e. the Database)
-  edm::ESHandle<PixelFEDChannelCollectionMap> PixelFEDChannelCollectionMapHandle;
-  edm::LogInfo("PixelFEDChannelCollectionMapTestReader") << "got eshandle" << std::endl;
-
-  context.get<SiPixelFEDChannelContainerESProducerRcd>().get(PixelFEDChannelCollectionMapHandle);
-  edm::LogInfo("PixelFEDChannelCollectionMapTestReader") << "got context" << std::endl;
+  edm::ESHandle<PixelFEDChannelCollectionMap> PixelFEDChannelCollectionMapHandle =
+      context.getHandle(pixelFEDChannelCollectionMapToken_);
+  edm::LogInfo("PixelFEDChannelCollectionMapTestReader") << "got eshandle and context" << std::endl;
 
   const PixelFEDChannelCollectionMap* thePixelFEDChannelCollectionMap = PixelFEDChannelCollectionMapHandle.product();
   edm::LogInfo("PixelFEDChannelCollectionMapTestReader") << "got SiPixelFEDChannelContainer* " << std::endl;

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc
@@ -3,11 +3,12 @@
 #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h"
 
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 namespace cms {
   SiPixelFakeGainForHLTReader::SiPixelFakeGainForHLTReader(const edm::ParameterSet& conf)
       : conf_(conf),
+        trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
+        trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
         SiPixelGainCalibrationForHLTService_(conf),
         filename_(conf.getParameter<std::string>("fileName")) {}
 
@@ -17,14 +18,9 @@ namespace cms {
     fFile->cd();
 
     // Get the Geometry
-    iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
+    edm::ESHandle<TrackerGeometry> tkgeom = iSetup.getHandle(trackerGeomToken_);
     edm::LogInfo("SiPixelFakeGainForHLTReader") << " There are " << tkgeom->dets().size() << " detectors" << std::endl;
 
-    // Get the calibrationForHLT data
-    //iSetup.get<SiPixelGainCalibrationForHLTRcd>().get(SiPixelGainCalibrationForHLT_);
-    //edm::LogInfo("SiPixelFakeGainForHLTReader") << "[SiPixelFakeGainForHLTReader::analyze] End Reading FakeGainForHLTects" << std::endl;
-    //SiPixelGainCalibrationForHLTService_.setESObjects(iSetup);
-
     //  for(TrackerGeometry::DetContainer::const_iterator it = tkgeom->dets().begin(); it != tkgeom->dets().end(); it++){
     //   if( dynamic_cast<PixelGeomDetUnit*>((*it))!=0){
     //     uint32_t detid=((*it)->geographicalId()).rawId();
@@ -85,17 +81,14 @@ namespace cms {
       char name[128];
 
       // Get Geometry
-      iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
+      edm::ESHandle<TrackerGeometry> tkgeom = iSetup.getHandle(trackerGeomTokenBeginRun_);
 
       // Get the calibrationForHLT data
-      //edm::ESHandle<SiPixelGainCalibration> SiPixelGainCalibration_;
-      //iSetup.get<SiPixelGainCalibrationRcd>().get(SiPixelGainCalibration_);
       SiPixelGainCalibrationForHLTService_.setESObjects(iSetup);
       edm::LogInfo("SiPixelFakeGainForHLTReader")
           << "[SiPixelFakeGainForHLTReader::beginJob] End Reading FakeGainForHLTects" << std::endl;
       // Get the list of DetId's
       std::vector<uint32_t> vdetId_ = SiPixelGainCalibrationForHLTService_.getDetIds();
-      //SiPixelGainCalibrationForHLT_->getDetIds(vdetId_);
       // Loop over DetId's
       for (std::vector<uint32_t>::const_iterator detid_iter = vdetId_.begin(); detid_iter != vdetId_.end();
            detid_iter++) {

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h
@@ -19,13 +19,9 @@
 //
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #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/SiPixelGainCalibrationForHLT.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h"
 
 #include "TROOT.h"
@@ -47,8 +43,8 @@ namespace cms {
 
   private:
     edm::ParameterSet conf_;
-    edm::ESHandle<TrackerGeometry> tkgeom;
-    //edm::ESHandle<SiPixelGainCalibrationForHLT> SiPixelGainCalibrationForHLT_;
+    edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomToken_;
+    edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomTokenBeginRun_;
     SiPixelGainCalibrationForHLTService SiPixelGainCalibrationForHLTService_;
 
     std::map<uint32_t, TH1F*> _TH1F_Pedestals_m;

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc
@@ -3,12 +3,13 @@
 #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h"
 
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 namespace cms {
   SiPixelFakeGainOfflineReader::SiPixelFakeGainOfflineReader(const edm::ParameterSet& conf)
       : conf_(conf),
         SiPixelGainCalibrationOfflineService_(conf),
+        trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
+        trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
         filename_(conf.getParameter<std::string>("fileName")) {}
 
   void SiPixelFakeGainOfflineReader::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
@@ -17,14 +18,9 @@ namespace cms {
     fFile->cd();
 
     // Get the Geometry
-    iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
+    edm::ESHandle<TrackerGeometry> tkgeom = iSetup.getHandle(trackerGeomToken_);
     edm::LogInfo("SiPixelFakeGainOfflineReader") << " There are " << tkgeom->dets().size() << " detectors" << std::endl;
 
-    // Get the calibrationOffline data
-    //iSetup.get<SiPixelGainCalibrationOfflineRcd>().get(SiPixelGainCalibrationOffline_);
-    //edm::LogInfo("SiPixelFakeGainOfflineReader") << "[SiPixelFakeGainOfflineReader::analyze] End Reading FakeGainOfflineects" << std::endl;
-    //SiPixelGainCalibrationOfflineService_.setESObjects(iSetup);
-
     //  for(TrackerGeometry::DetContainer::const_iterator it = tkgeom->dets().begin(); it != tkgeom->dets().end(); it++){
     //   if( dynamic_cast<PixelGeomDetUnit*>((*it))!=0){
     //     uint32_t detid=((*it)->geographicalId()).rawId();
@@ -91,17 +87,14 @@ namespace cms {
       char name[128];
 
       // Get Geometry
-      iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
+      edm::ESHandle<TrackerGeometry> tkgeom = iSetup.getHandle(trackerGeomTokenBeginRun_);
 
       // Get the calibrationOffline data
-      //edm::ESHandle<SiPixelGainCalibrationOffline> SiPixelGainCalibrationOffline_;
-      //iSetup.get<SiPixelGainCalibrationOfflineRcd>().get(SiPixelGainCalibrationOffline_);
       SiPixelGainCalibrationOfflineService_.setESObjects(iSetup);
       edm::LogInfo("SiPixelFakeGainOfflineReader")
           << "[SiPixelFakeGainOfflineReader::beginJob] End Reading FakeGainOfflineects" << std::endl;
       // Get the list of DetId's
       std::vector<uint32_t> vdetId_ = SiPixelGainCalibrationOfflineService_.getDetIds();
-      //SiPixelGainCalibrationOffline_->getDetIds(vdetId_);
       // Loop over DetId's
       for (std::vector<uint32_t>::const_iterator detid_iter = vdetId_.begin(); detid_iter != vdetId_.end();
            detid_iter++) {

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h
@@ -19,13 +19,9 @@
 //
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #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/SiPixelGainCalibrationOffline.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h"
 
 #include "TROOT.h"
@@ -47,10 +43,10 @@ namespace cms {
 
   private:
     edm::ParameterSet conf_;
-    edm::ESHandle<TrackerGeometry> tkgeom;
-    //edm::ESHandle<SiPixelGainCalibrationOffline> SiPixelGainCalibrationOffline_;
-    SiPixelGainCalibrationOfflineService SiPixelGainCalibrationOfflineService_;
 
+    SiPixelGainCalibrationOfflineService SiPixelGainCalibrationOfflineService_;
+    edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomToken_;
+    edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomTokenBeginRun_;
     std::map<uint32_t, TH1F*> _TH1F_Pedestals_m;
     std::map<uint32_t, TH1F*> _TH1F_Gains_m;
     std::string filename_;

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc
@@ -3,26 +3,24 @@
 #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h"
 
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 namespace cms {
   SiPixelFakeGainReader::SiPixelFakeGainReader(const edm::ParameterSet& conf)
-      : conf_(conf), SiPixelGainCalibrationService_(conf), filename_(conf.getParameter<std::string>("fileName")) {}
+      : conf_(conf),
+        trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
+        trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
+        SiPixelGainCalibrationService_(conf),
+        filename_(conf.getParameter<std::string>("fileName")) {}
 
   void SiPixelFakeGainReader::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
     unsigned int nmodules = 0;
     uint32_t nchannels = 0;
     fFile->cd();
 
     // Get the Geometry
-    iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
+    edm::ESHandle<TrackerGeometry> tkgeom = iSetup.getHandle(trackerGeomToken_);
     edm::LogInfo("SiPixelFakeGainReader") << " There are " << tkgeom->dets().size() << " detectors" << std::endl;
 
-    // Get the calibration data
-    //iSetup.get<SiPixelGainCalibrationRcd>().get(SiPixelGainCalibration_);
-    //edm::LogInfo("SiPixelFakeGainReader") << "[SiPixelFakeGainReader::analyze] End Reading FakeGainects" << std::endl;
-    //SiPixelGainCalibrationService_.setESObjects(iSetup);
-
     //  for(TrackerGeometry::DetContainer::const_iterator it = tkgeom->dets().begin(); it != tkgeom->dets().end(); it++){
     //   if( dynamic_cast<PixelGeomDetUnit*>((*it))!=0){
     //     uint32_t detid=((*it)->geographicalId()).rawId();
@@ -89,17 +87,14 @@ namespace cms {
       char name[128];
 
       // Get Geometry
-      iSetup.get<TrackerDigiGeometryRecord>().get(tkgeom);
+      edm::ESHandle<TrackerGeometry> tkgeom = iSetup.getHandle(trackerGeomTokenBeginRun_);
 
       // Get the calibration data
-      //edm::ESHandle<SiPixelGainCalibration> SiPixelGainCalibration_;
-      //iSetup.get<SiPixelGainCalibrationRcd>().get(SiPixelGainCalibration_);
       SiPixelGainCalibrationService_.setESObjects(iSetup);
       edm::LogInfo("SiPixelFakeGainReader")
           << "[SiPixelFakeGainReader::beginJob] End Reading FakeGainects" << std::endl;
       // Get the list of DetId's
       std::vector<uint32_t> vdetId_ = SiPixelGainCalibrationService_.getDetIds();
-      //SiPixelGainCalibration_->getDetIds(vdetId_);
       // Loop over DetId's
       for (std::vector<uint32_t>::const_iterator detid_iter = vdetId_.begin(); detid_iter != vdetId_.end();
            detid_iter++) {