Merge pull request #21984 from gartung/TrackingTools-MaterialEffects-…

…returntype TrackingTools/MaterialEffects: Remove class member that is not needed.
cms-sw · Jan 29, 2018 · 35ff8bf · 35ff8bf
2 parents 9773c53 + af345ee
commit 35ff8bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.cc b/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.cc
@@ -23,7 +23,7 @@ PropagatorWithMaterialESProducer::PropagatorWithMaterialESProducer(const edm::Pa
 
 PropagatorWithMaterialESProducer::~PropagatorWithMaterialESProducer() {}
 
-std::shared_ptr<Propagator> 
+std::unique_ptr<Propagator> 
 PropagatorWithMaterialESProducer::produce(const TrackingComponentsRecord & iRecord){ 
 //   if (_propagator){
 //     delete _propagator;
@@ -53,10 +53,9 @@ PropagatorWithMaterialESProducer::produce(const TrackingComponentsRecord & iReco
   if (pdir == "alongMomentum") dir = alongMomentum;
   if (pdir == "anyDirection") dir = anyDirection;
 
-  _propagator = std::make_shared<PropagatorWithMaterial>(dir, mass, &(*magfield),
-									maxDPhi,useRK,ptMin,
-									useOldAnalPropLogic);
-  return _propagator;
+  return std::make_unique<PropagatorWithMaterial>(dir, mass, &(*magfield),
+						maxDPhi,useRK,ptMin,
+						useOldAnalPropLogic);
 }
 
 
diff --git a/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.h b/TrackingTools/MaterialEffects/plugins/PropagatorWithMaterialESProducer.h
@@ -17,9 +17,8 @@ class  PropagatorWithMaterialESProducer: public edm::ESProducer{
  public:
   PropagatorWithMaterialESProducer(const edm::ParameterSet & p);
   ~PropagatorWithMaterialESProducer() override; 
-  std::shared_ptr<Propagator> produce(const TrackingComponentsRecord &);
+  std::unique_ptr<Propagator> produce(const TrackingComponentsRecord &);
  private:
-  std::shared_ptr<Propagator> _propagator;
   edm::ParameterSet pset_;
 };