From b212d4a2b8ece0dcccb1014f274af96ee481475e Mon Sep 17 00:00:00 2001
From: Patrick Gartung <gartung@fnal.gov>
Date: Fri, 26 Jan 2018 21:24:52 +0100
Subject: [PATCH] TrackingTools/RecoGeometry: Remove class member that is not
 needed. Change return type to unique_ptr and return directly from
 make_unique.

---
 .../RecoGeometry/plugins/DetLayerGeometryESProducer.cc       | 5 ++---
 .../RecoGeometry/plugins/DetLayerGeometryESProducer.h        | 4 +---
 .../RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.cc | 5 ++---
 .../RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.h  | 4 +---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/TrackingTools/RecoGeometry/plugins/DetLayerGeometryESProducer.cc b/TrackingTools/RecoGeometry/plugins/DetLayerGeometryESProducer.cc
index af4b8fffd97ce..28dd56aab9dd4 100644
--- a/TrackingTools/RecoGeometry/plugins/DetLayerGeometryESProducer.cc
+++ b/TrackingTools/RecoGeometry/plugins/DetLayerGeometryESProducer.cc
@@ -19,12 +19,11 @@ DetLayerGeometryESProducer::DetLayerGeometryESProducer(const edm::ParameterSet &
  
 DetLayerGeometryESProducer::~DetLayerGeometryESProducer() {}
 
-std::shared_ptr<DetLayerGeometry> 
+std::unique_ptr<DetLayerGeometry> 
 DetLayerGeometryESProducer::produce(const RecoGeometryRecord & iRecord){ 
 
 
-  geometry_ = std::make_shared<DetLayerGeometry>();
-  return geometry_;
+  return std::make_unique<DetLayerGeometry>();
 }
 
 
diff --git a/TrackingTools/RecoGeometry/plugins/DetLayerGeometryESProducer.h b/TrackingTools/RecoGeometry/plugins/DetLayerGeometryESProducer.h
index 2abd2c45bfdd8..c8b39a551e66a 100644
--- a/TrackingTools/RecoGeometry/plugins/DetLayerGeometryESProducer.h
+++ b/TrackingTools/RecoGeometry/plugins/DetLayerGeometryESProducer.h
@@ -11,9 +11,7 @@ class  DetLayerGeometryESProducer: public edm::ESProducer{
  public:
   DetLayerGeometryESProducer(const edm::ParameterSet & p);
   ~DetLayerGeometryESProducer() override; 
-  std::shared_ptr<DetLayerGeometry> produce(const RecoGeometryRecord &);
- private:
-  std::shared_ptr<DetLayerGeometry> geometry_;
+  std::unique_ptr<DetLayerGeometry> produce(const RecoGeometryRecord &);
 };
 
 
diff --git a/TrackingTools/RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.cc b/TrackingTools/RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.cc
index 334c30719fba0..4811812a1fc5f 100644
--- a/TrackingTools/RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.cc
+++ b/TrackingTools/RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.cc
@@ -18,7 +18,7 @@ GlobalDetLayerGeometryESProducer::GlobalDetLayerGeometryESProducer(const edm::Pa
  
 GlobalDetLayerGeometryESProducer::~GlobalDetLayerGeometryESProducer() {}
 
-std::shared_ptr<DetLayerGeometry> 
+std::unique_ptr<DetLayerGeometry> 
 GlobalDetLayerGeometryESProducer::produce(const RecoGeometryRecord & iRecord){ 
   
   edm::ESHandle<GeometricSearchTracker> tracker;  
@@ -27,8 +27,7 @@ GlobalDetLayerGeometryESProducer::produce(const RecoGeometryRecord & iRecord){
   iRecord.getRecord<TrackerRecoGeometryRecord>().get(tracker);
   iRecord.getRecord<MuonRecoGeometryRecord>().get(muon);
 
-  geometry_ = std::make_shared<GlobalDetLayerGeometry>(tracker.product(), muon.product());
-  return geometry_;
+  return std::make_unique<GlobalDetLayerGeometry>(tracker.product(), muon.product());
 }
 
 
diff --git a/TrackingTools/RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.h b/TrackingTools/RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.h
index 079a33ac055c9..81dc64e1f1d63 100644
--- a/TrackingTools/RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.h
+++ b/TrackingTools/RecoGeometry/plugins/GlobalDetLayerGeometryESProducer.h
@@ -11,9 +11,7 @@ class  GlobalDetLayerGeometryESProducer: public edm::ESProducer{
  public:
   GlobalDetLayerGeometryESProducer(const edm::ParameterSet & p);
   ~GlobalDetLayerGeometryESProducer() override; 
-  std::shared_ptr<DetLayerGeometry> produce(const RecoGeometryRecord &);
- private:
-  std::shared_ptr<DetLayerGeometry> geometry_;
+  std::unique_ptr<DetLayerGeometry> produce(const RecoGeometryRecord &);
 };