Added consumes to RecoLocalFastTime packages

Also uses ESGetToken to obtained the data.
cms-sw · Nov 4, 2019 · d4b2350 · d4b2350
1 parent ba4c055
commit d4b2350
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/RecoLocalFastTime/FTLClusterizer/plugins/MTDCPEESProducer.cc b/RecoLocalFastTime/FTLClusterizer/plugins/MTDCPEESProducer.cc
@@ -26,11 +26,12 @@ class MTDCPEESProducer : public edm::ESProducer {
 
 private:
   edm::ParameterSet pset_;
+  edm::ESGetToken<MTDGeometry, MTDDigiGeometryRecord> ddToken_;
 };
 
 MTDCPEESProducer::MTDCPEESProducer(const edm::ParameterSet& p) {
   pset_ = p;
-  setWhatProduced(this, "MTDCPEBase");
+  setWhatProduced(this, "MTDCPEBase").setConsumes(ddToken_);
 }
 
 // Configuration descriptions
@@ -40,10 +41,7 @@ void MTDCPEESProducer::fillDescriptions(edm::ConfigurationDescriptions& descript
 }
 
 std::unique_ptr<MTDClusterParameterEstimator> MTDCPEESProducer::produce(const MTDCPERecord& iRecord) {
-  edm::ESHandle<MTDGeometry> pDD;
-  iRecord.getRecord<MTDDigiGeometryRecord>().get(pDD);
-
-  return std::make_unique<MTDCPEBase>(pset_, *pDD.product());
+  return std::make_unique<MTDCPEBase>(pset_, iRecord.get(ddToken_));
 }
 
 #include "FWCore/PluginManager/interface/ModuleDef.h"

diff --git a/RecoLocalFastTime/FTLRecProducers/plugins/MTDTimeCalibESProducer.cc b/RecoLocalFastTime/FTLRecProducers/plugins/MTDTimeCalibESProducer.cc
@@ -29,12 +29,14 @@ class MTDTimeCalibESProducer : public edm::ESProducer {
   std::unique_ptr<MTDTimeCalib> produce(const MTDTimeCalibRecord&);
 
 private:
+  edm::ESGetToken<MTDGeometry, MTDDigiGeometryRecord> ddToken_;
+  edm::ESGetToken<MTDTopology, MTDTopologyRcd> topoToken_;
   edm::ParameterSet pset_;
 };
 
 MTDTimeCalibESProducer::MTDTimeCalibESProducer(const edm::ParameterSet& p) {
   pset_ = p;
-  setWhatProduced(this, "MTDTimeCalib");
+  setWhatProduced(this, "MTDTimeCalib").setConsumes(ddToken_).setConsumes(topoToken_);
 }
 
 // Configuration descriptions
@@ -49,13 +51,7 @@ void MTDTimeCalibESProducer::fillDescriptions(edm::ConfigurationDescriptions& de
 }
 
 std::unique_ptr<MTDTimeCalib> MTDTimeCalibESProducer::produce(const MTDTimeCalibRecord& iRecord) {
-  edm::ESHandle<MTDGeometry> pDD;
-  iRecord.getRecord<MTDDigiGeometryRecord>().get(pDD);
-
-  edm::ESHandle<MTDTopology> pTopo;
-  iRecord.getRecord<MTDTopologyRcd>().get(pTopo);
-
-  return std::make_unique<MTDTimeCalib>(pset_, pDD.product(), pTopo.product());
+  return std::make_unique<MTDTimeCalib>(pset_, &iRecord.get(ddToken_), &iRecord.get(topoToken_));
 }
 
 #include "FWCore/PluginManager/interface/ModuleDef.h"