get rid of CMSDEPRECATED_X warnings in FastSimulation/TrackerSetup

Author: mmusich

FastSimulation/TrackerSetup/plugins/TrackerInteractionGeometryESProducer.cc

@@ -1,26 +1,36 @@
-#include "FastSimulation/TrackerSetup/plugins/TrackerInteractionGeometryESProducer.h"
-#include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h"
-
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ModuleFactory.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FastSimulation/TrackerSetup/interface/TrackerInteractionGeometry.h"
+#include "FastSimulation/TrackerSetup/interface/TrackerInteractionGeometryRecord.h"
+#include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h"
 
 #include <memory>
+#include <string>
 
-TrackerInteractionGeometryESProducer::TrackerInteractionGeometryESProducer(const edm::ParameterSet& p) {
-  setWhatProduced(this);
-  _label = p.getUntrackedParameter<std::string>("trackerGeometryLabel", "");
+class TrackerInteractionGeometryESProducer : public edm::ESProducer {
+public:
+  TrackerInteractionGeometryESProducer(const edm::ParameterSet& p);
+  ~TrackerInteractionGeometryESProducer() override = default;
+  std::unique_ptr<TrackerInteractionGeometry> produce(const TrackerInteractionGeometryRecord&);
 
-  theTrackerMaterial = p.getParameter<edm::ParameterSet>("TrackerMaterial");
-}
+private:
+  edm::ESGetToken<GeometricSearchTracker, TrackerRecoGeometryRecord> geoSearchToken_;
+  std::string label_;
+  edm::ParameterSet theTrackerMaterial_;
+};
 
-TrackerInteractionGeometryESProducer::~TrackerInteractionGeometryESProducer() {}
+TrackerInteractionGeometryESProducer::TrackerInteractionGeometryESProducer(const edm::ParameterSet& p) {
+  auto cc = setWhatProduced(this);
+  label_ = p.getUntrackedParameter<std::string>("trackerGeometryLabel", "");
+  geoSearchToken_ = cc.consumes(edm::ESInputTag("", label_));
+  theTrackerMaterial_ = p.getParameter<edm::ParameterSet>("TrackerMaterial");
+}
 
 std::unique_ptr<TrackerInteractionGeometry> TrackerInteractionGeometryESProducer::produce(
     const TrackerInteractionGeometryRecord& iRecord) {
-  edm::ESHandle<GeometricSearchTracker> theGeomSearchTracker;
-
-  iRecord.getRecord<TrackerRecoGeometryRecord>().get(_label, theGeomSearchTracker);
-  return std::make_unique<TrackerInteractionGeometry>(theTrackerMaterial, &(*theGeomSearchTracker));
+  const GeometricSearchTracker* theGeomSearchTracker = &iRecord.get(geoSearchToken_);
+  return std::make_unique<TrackerInteractionGeometry>(theTrackerMaterial_, theGeomSearchTracker);
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(TrackerInteractionGeometryESProducer);