cms-sw · cmsbuild · Jan 28, 2021 · Dec 3, 2020 · Dec 3, 2020 · Dec 3, 2020
diff --git a/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h
@@ -31,7 +31,6 @@
 #include "TFile.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "CalibTracker/SiStripQuality/interface/SiStripQualityHistos.h"
 
@@ -58,7 +57,7 @@ class SiStripBadAPVAlgorithmFromClusterOccupancy {
     WriteOutputFile_ = WriteOutputFile;
   }
   void setTrackerGeometry(const TrackerGeometry* tkgeom) { TkGeom = tkgeom; }
-  void extractBadAPVs(SiStripQuality*, HistoMap&, edm::ESHandle<SiStripQuality>&);
+  void extractBadAPVs(SiStripQuality*, HistoMap&, const SiStripQuality*);
 
 private:
   struct Apv {
@@ -75,7 +74,7 @@ class SiStripBadAPVAlgorithmFromClusterOccupancy {
                         std::vector<Apv>&,
                         std::pair<double, double>*,
                         std::vector<unsigned int>&,
-                        edm::ESHandle<SiStripQuality>&);
+                        const SiStripQuality*);
 
   struct pHisto {
     pHisto() : _NEntries(0), _NBins(0){};

diff --git a/...bTracker/SiStripQuality/interface/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h b/...bTracker/SiStripQuality/interface/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h
@@ -31,7 +31,6 @@
 #include "TFile.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "CalibTracker/SiStripQuality/interface/SiStripQualityHistos.h"
 
@@ -70,7 +69,7 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy {
     WriteDQMHistograms_ = WriteDQMHistograms;
   }
   void setTrackerGeometry(const TrackerGeometry* tkgeom) { TkGeom = tkgeom; }
-  void extractBadAPVSandStrips(SiStripQuality*, HistoMap&, edm::ESHandle<SiStripQuality>&);
+  void extractBadAPVSandStrips(SiStripQuality*, HistoMap&, const SiStripQuality*);
 
 private:
   struct Apv {
@@ -90,7 +89,7 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy {
                         std::vector<Apv>&,
                         std::pair<double, double>*,
                         std::vector<unsigned int>&,
-                        edm::ESHandle<SiStripQuality>&);
+                        const SiStripQuality*);
 
   void iterativeSearch(Apv&, std::vector<unsigned int>&, int);
 

diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc
@@ -29,7 +29,7 @@ SiStripBadAPVAlgorithmFromClusterOccupancy::~SiStripBadAPVAlgorithmFromClusterOc
 
 void SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs(SiStripQuality* siStripQuality,
                                                                 HistoMap& DM,
-                                                                edm::ESHandle<SiStripQuality>& inSiStripQuality) {
+                                                                const SiStripQuality* inSiStripQuality) {
   LogTrace("SiStripBadAPVAlgorithmFromClusterOccupancy")
       << "[SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs] " << std::endl;
 
@@ -450,7 +450,7 @@ void SiStripBadAPVAlgorithmFromClusterOccupancy::AnalyzeOccupancy(SiStripQuality
                                                                   std::vector<Apv>& medianValues,
                                                                   std::pair<double, double>* MeanAndRms,
                                                                   std::vector<unsigned int>& BadStripList,
-                                                                  edm::ESHandle<SiStripQuality>& InSiStripQuality) {
+                                                                  const SiStripQuality* InSiStripQuality) {
   int Moduleposition;
   uint32_t Detid;
 

diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc
@@ -33,7 +33,7 @@ SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::~SiStripBadAPVandHotStrip
 }
 
 void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::extractBadAPVSandStrips(
-    SiStripQuality* siStripQuality, HistoMap& DM, edm::ESHandle<SiStripQuality>& inSiStripQuality) {
+    SiStripQuality* siStripQuality, HistoMap& DM, const SiStripQuality* inSiStripQuality) {
   LogTrace("SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy")
       << "[SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::extractBadAPVs] " << std::endl;
 
@@ -471,12 +471,11 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(
   }
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::AnalyzeOccupancy(
-    SiStripQuality* quality,
-    std::vector<Apv>& medianValues,
-    std::pair<double, double>* MeanAndRms,
-    std::vector<unsigned int>& BadStripList,
-    edm::ESHandle<SiStripQuality>& InSiStripQuality) {
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::AnalyzeOccupancy(SiStripQuality* quality,
+                                                                             std::vector<Apv>& medianValues,
+                                                                             std::pair<double, double>* MeanAndRms,
+                                                                             std::vector<unsigned int>& BadStripList,
+                                                                             const SiStripQuality* InSiStripQuality) {
   int Moduleposition;
   uint32_t Detid;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/ApvTimingHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/ApvTimingHistosUsingDb.h
@@ -7,7 +7,10 @@
 
 class ApvTimingHistosUsingDb : public CommissioningHistosUsingDb, public ApvTimingHistograms {
 public:
-  ApvTimingHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  ApvTimingHistosUsingDb(const edm::ParameterSet& pset,
+                         DQMStore*,
+                         SiStripConfigDb* const,
+                         edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~ApvTimingHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/CalibrationHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/CalibrationHistosUsingDb.h
@@ -15,6 +15,7 @@ class CalibrationHistosUsingDb : public CommissioningHistosUsingDb, public Calib
   CalibrationHistosUsingDb(const edm::ParameterSet& pset,
                            DQMStore*,
                            SiStripConfigDb* const,
+                           edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken,
                            const sistrip::RunType& task = sistrip::CALIBRATION);
 
   ~CalibrationHistosUsingDb() override;

diff --git a/DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h
@@ -2,6 +2,7 @@
 #ifndef DQM_SiStripCommissioningClients_CommissioningHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_CommissioningHistosUsingDb_H
 
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
 #include "DQM/SiStripCommissioningClients/interface/CommissioningHistograms.h"
 #include "OnlineDB/SiStripConfigDb/interface/SiStripConfigDb.h"
@@ -12,12 +13,15 @@
 
 class SiStripConfigDb;
 class SiStripFedCabling;
+class TrackerTopology;
 
 class CommissioningHistosUsingDb : public virtual CommissioningHistograms {
   // ---------- public interface ----------
 
 public:
-  CommissioningHistosUsingDb(SiStripConfigDb* const, sistrip::RunType = sistrip::UNDEFINED_RUN_TYPE);
+  CommissioningHistosUsingDb(SiStripConfigDb* const,
+                             edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken,
+                             sistrip::RunType = sistrip::UNDEFINED_RUN_TYPE);
 
   ~CommissioningHistosUsingDb() override;
 
@@ -82,6 +86,8 @@ class CommissioningHistosUsingDb : public virtual CommissioningHistograms {
   bool uploadAnal_;
 
   bool uploadConf_;
+
+  edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
 };
 
 inline void CommissioningHistosUsingDb::doUploadConf(bool upload) { uploadConf_ = upload; }

diff --git a/DQM/SiStripCommissioningDbClients/interface/DaqScopeModeHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/DaqScopeModeHistosUsingDb.h
@@ -6,7 +6,10 @@
 
 class DaqScopeModeHistosUsingDb : public CommissioningHistosUsingDb, public DaqScopeModeHistograms {
 public:
-  DaqScopeModeHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  DaqScopeModeHistosUsingDb(const edm::ParameterSet& pset,
+                            DQMStore*,
+                            SiStripConfigDb* const,
+                            edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~DaqScopeModeHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/FastFedCablingHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/FastFedCablingHistosUsingDb.h
@@ -7,7 +7,10 @@
 
 class FastFedCablingHistosUsingDb : public CommissioningHistosUsingDb, public FastFedCablingHistograms {
 public:
-  FastFedCablingHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  FastFedCablingHistosUsingDb(const edm::ParameterSet& pset,
+                              DQMStore*,
+                              SiStripConfigDb* const,
+                              edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~FastFedCablingHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/FineDelayHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/FineDelayHistosUsingDb.h
@@ -2,6 +2,7 @@
 #ifndef DQM_SiStripCommissioningClients_FineDelayHistosUsingDb_H
 #define DQM_SiStripCommissioningClients_FineDelayHistosUsingDb_H
 
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "DQM/SiStripCommissioningClients/interface/SamplingHistograms.h"
 #include "DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h"
 #include "OnlineDB/SiStripConfigDb/interface/SiStripConfigDb.h"
@@ -12,7 +13,11 @@ class TrackerGeometry;
 
 class FineDelayHistosUsingDb : public CommissioningHistosUsingDb, public SamplingHistograms {
 public:
-  FineDelayHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  FineDelayHistosUsingDb(const edm::ParameterSet& pset,
+                         DQMStore*,
+                         SiStripConfigDb* const,
+                         edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken,
+                         edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken);
 
   ~FineDelayHistosUsingDb() override;
 
@@ -31,6 +36,7 @@ class FineDelayHistosUsingDb : public CommissioningHistosUsingDb, public Samplin
 
   std::map<unsigned int, float> delays_;
 
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
   const TrackerGeometry* tracker_;
 
   bool cosmic_;

diff --git a/DQM/SiStripCommissioningDbClients/interface/LatencyHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/LatencyHistosUsingDb.h
@@ -10,7 +10,10 @@
 
 class LatencyHistosUsingDb : public CommissioningHistosUsingDb, public SamplingHistograms {
 public:
-  LatencyHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  LatencyHistosUsingDb(const edm::ParameterSet& pset,
+                       DQMStore*,
+                       SiStripConfigDb* const,
+                       edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~LatencyHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/NoiseHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/NoiseHistosUsingDb.h
@@ -7,7 +7,10 @@
 
 class NoiseHistosUsingDb : public CommissioningHistosUsingDb, public NoiseHistograms {
 public:
-  NoiseHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  NoiseHistosUsingDb(const edm::ParameterSet& pset,
+                     DQMStore*,
+                     SiStripConfigDb* const,
+                     edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~NoiseHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/OptoScanHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/OptoScanHistosUsingDb.h
@@ -7,7 +7,10 @@
 
 class OptoScanHistosUsingDb : public CommissioningHistosUsingDb, public OptoScanHistograms {
 public:
-  OptoScanHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  OptoScanHistosUsingDb(const edm::ParameterSet& pset,
+                        DQMStore*,
+                        SiStripConfigDb* const,
+                        edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~OptoScanHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/PedestalsHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/PedestalsHistosUsingDb.h
@@ -7,7 +7,10 @@
 
 class PedestalsHistosUsingDb : public CommissioningHistosUsingDb, public PedestalsHistograms {
 public:
-  PedestalsHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  PedestalsHistosUsingDb(const edm::ParameterSet& pset,
+                         DQMStore*,
+                         SiStripConfigDb* const,
+                         edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~PedestalsHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/PedsFullNoiseHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/PedsFullNoiseHistosUsingDb.h
@@ -7,7 +7,10 @@
 
 class PedsFullNoiseHistosUsingDb : public CommissioningHistosUsingDb, public PedsFullNoiseHistograms {
 public:
-  PedsFullNoiseHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  PedsFullNoiseHistosUsingDb(const edm::ParameterSet& pset,
+                             DQMStore*,
+                             SiStripConfigDb* const,
+                             edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~PedsFullNoiseHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/PedsOnlyHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/PedsOnlyHistosUsingDb.h
@@ -7,7 +7,10 @@
 
 class PedsOnlyHistosUsingDb : public CommissioningHistosUsingDb, public PedsOnlyHistograms {
 public:
-  PedsOnlyHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  PedsOnlyHistosUsingDb(const edm::ParameterSet& pset,
+                        DQMStore*,
+                        SiStripConfigDb* const,
+                        edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~PedsOnlyHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/interface/VpspScanHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/VpspScanHistosUsingDb.h
@@ -7,7 +7,10 @@
 
 class VpspScanHistosUsingDb : public CommissioningHistosUsingDb, public VpspScanHistograms {
 public:
-  VpspScanHistosUsingDb(const edm::ParameterSet& pset, DQMStore*, SiStripConfigDb* const);
+  VpspScanHistosUsingDb(const edm::ParameterSet& pset,
+                        DQMStore*,
+                        SiStripConfigDb* const,
+                        edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken);
 
   ~VpspScanHistosUsingDb() override;
 

diff --git a/DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.cc b/DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.cc
@@ -27,7 +27,9 @@ using namespace sistrip;
 SiStripCommissioningOfflineDbClient::SiStripCommissioningOfflineDbClient(const edm::ParameterSet& pset)
     : SiStripCommissioningOfflineClient(pset),
       uploadAnal_(pset.getUntrackedParameter<bool>("UploadAnalyses", false)),
-      uploadConf_(pset.getUntrackedParameter<bool>("UploadHwConfig", false)) {
+      uploadConf_(pset.getUntrackedParameter<bool>("UploadHwConfig", false)),
+      tTopoToken_{esConsumes<edm::Transition::BeginRun>()},
+      tkGeomToken_{esConsumes<edm::Transition::BeginRun>()} {
   LogTrace(mlDqmClient_) << "[SiStripCommissioningOfflineDbClient::" << __func__ << "]"
                          << " Constructing object...";
   if (!uploadConf_) {
@@ -85,30 +87,30 @@ void SiStripCommissioningOfflineDbClient::createHistos(const edm::ParameterSet&
 
   // Create corresponding "commissioning histograms" object
   if (runType_ == sistrip::FAST_CABLING) {
-    histos_ = new FastFedCablingHistosUsingDb(pset, bei_, db);
+    histos_ = new FastFedCablingHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::APV_TIMING) {
-    histos_ = new ApvTimingHistosUsingDb(pset, bei_, db);
+    histos_ = new ApvTimingHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::OPTO_SCAN) {
-    histos_ = new OptoScanHistosUsingDb(pset, bei_, db);
+    histos_ = new OptoScanHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::VPSP_SCAN) {
-    histos_ = new VpspScanHistosUsingDb(pset, bei_, db);
+    histos_ = new VpspScanHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::PEDESTALS) {
-    histos_ = new PedestalsHistosUsingDb(pset, bei_, db);
+    histos_ = new PedestalsHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::PEDS_ONLY) {
-    histos_ = new PedsOnlyHistosUsingDb(pset, bei_, db);
+    histos_ = new PedsOnlyHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::PEDS_FULL_NOISE) {
-    histos_ = new PedsFullNoiseHistosUsingDb(pset, bei_, db);
+    histos_ = new PedsFullNoiseHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::NOISE) {
-    histos_ = new NoiseHistosUsingDb(pset, bei_, db);
+    histos_ = new NoiseHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::APV_LATENCY) {
-    histos_ = new LatencyHistosUsingDb(pset, bei_, db);
+    histos_ = new LatencyHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::FINE_DELAY) {
-    histos_ = new FineDelayHistosUsingDb(pset, bei_, db);
+    histos_ = new FineDelayHistosUsingDb(pset, bei_, db, tTopoToken_, tkGeomToken_);
   } else if (runType_ == sistrip::CALIBRATION || runType_ == sistrip::CALIBRATION_DECO ||
              runType_ == sistrip::CALIBRATION_SCAN || runType_ == sistrip::CALIBRATION_SCAN_DECO) {
-    histos_ = new CalibrationHistosUsingDb(pset, bei_, db, runType_);
+    histos_ = new CalibrationHistosUsingDb(pset, bei_, db, tTopoToken_, runType_);
   } else if (runType_ == sistrip::DAQ_SCOPE_MODE) {
-    histos_ = new DaqScopeModeHistosUsingDb(pset, bei_, db);
+    histos_ = new DaqScopeModeHistosUsingDb(pset, bei_, db, tTopoToken_);
   } else if (runType_ == sistrip::UNDEFINED_RUN_TYPE) {
     histos_ = nullptr;
     edm::LogError(mlDqmClient_) << "[SiStripCommissioningOfflineDbClient::" << __func__ << "]"

diff --git a/DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.h b/DQM/SiStripCommissioningDbClients/plugins/SiStripCommissioningOfflineDbClient.h
@@ -2,10 +2,15 @@
 #ifndef DQM_SiStripCommissioningDbClients_SiStripCommissioningOfflineDbClient_H
 #define DQM_SiStripCommissioningDbClients_SiStripCommissioningOfflineDbClient_H
 
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
 #include "DQM/SiStripCommissioningClients/interface/SiStripCommissioningOfflineClient.h"
 #include "DQM/SiStripCommissioningClients/interface/SiStripTFile.h"
 
+class TrackerTopology;
+class TrackerGeometry;
+
 /**
    @class SiStripCommissioningOfflineDbClient 
    @author R.Bainbridge, M.Wingham
@@ -31,6 +36,9 @@ class SiStripCommissioningOfflineDbClient : public SiStripCommissioningOfflineCl
   bool uploadAnal_;
 
   bool uploadConf_;
+
+  edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> tkGeomToken_;
 };
 
 #endif  // DQM_SiStripCommissioningDbClients_SiStripCommissioningOfflineDbClient_H
diff --git a/DQM/SiStripCommissioningDbClients/src/ApvTimingHistosUsingDb.cc b/DQM/SiStripCommissioningDbClients/src/ApvTimingHistosUsingDb.cc
@@ -11,9 +11,12 @@ using namespace sistrip;
 
 // -----------------------------------------------------------------------------
 /** */
-ApvTimingHistosUsingDb::ApvTimingHistosUsingDb(const edm::ParameterSet& pset, DQMStore* bei, SiStripConfigDb* const db)
+ApvTimingHistosUsingDb::ApvTimingHistosUsingDb(const edm::ParameterSet& pset,
+                                               DQMStore* bei,
+                                               SiStripConfigDb* const db,
+                                               edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken)
     : CommissioningHistograms(pset.getParameter<edm::ParameterSet>("ApvTimingParameters"), bei, sistrip::APV_TIMING),
-      CommissioningHistosUsingDb(db, sistrip::APV_TIMING),
+      CommissioningHistosUsingDb(db, tTopoToken, sistrip::APV_TIMING),
       ApvTimingHistograms(pset.getParameter<edm::ParameterSet>("ApvTimingParameters"), bei) {
   LogTrace(mlDqmClient_) << "[ApvTimingHistosUsingDb::" << __func__ << "]"
                          << " Constructing object...";

diff --git a/DQM/SiStripCommissioningDbClients/src/CalibrationHistosUsingDb.cc b/DQM/SiStripCommissioningDbClients/src/CalibrationHistosUsingDb.cc
@@ -20,9 +20,10 @@ std::string getBasePath(const std::string& path) {
 CalibrationHistosUsingDb::CalibrationHistosUsingDb(const edm::ParameterSet& pset,
                                                    DQMStore* bei,
                                                    SiStripConfigDb* const db,
+                                                   edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken,
                                                    const sistrip::RunType& task)
     : CommissioningHistograms(pset.getParameter<edm::ParameterSet>("CalibrationParameters"), bei, task),
-      CommissioningHistosUsingDb(db, task),
+      CommissioningHistosUsingDb(db, tTopoToken, task),
       CalibrationHistograms(pset.getParameter<edm::ParameterSet>("CalibrationParameters"), bei, task) {
   LogTrace(mlDqmClient_) << "[CalibrationHistosUsingDb::" << __func__ << "]"
                          << " Constructing object...";