From deceb268faa9b81ac85417a734ceb6c9c5aa3046 Mon Sep 17 00:00:00 2001
From: Sam Harper <sam.j.harper@gmail.com>
Date: Thu, 17 Dec 2020 15:31:49 +0100
Subject: [PATCH] addressing review comments

---
 .../plugins/EgammaHLTHGCalIDVarProducer.cc                | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTHGCalIDVarProducer.cc b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTHGCalIDVarProducer.cc
index 6e29008195724..402b4df25a9f4 100644
--- a/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTHGCalIDVarProducer.cc
+++ b/RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTHGCalIDVarProducer.cc
@@ -31,17 +31,15 @@ class EgammaHLTHGCalIDVarProducer : public edm::stream::EDProducer<> {
   public:
     PCAAssocMap(double HGCalShowerShapeHelper::ShowerWidths::*var, const std::string& name) : var_(var), name_(name) {}
 
-    std::unique_ptr<reco::RecoEcalCandidateIsolationMap>& initMap(
-        const edm::Handle<reco::RecoEcalCandidateCollection>& candHandle) {
+    void initMap(const edm::Handle<reco::RecoEcalCandidateCollection>& candHandle) {
       assocMap_ = std::make_unique<reco::RecoEcalCandidateIsolationMap>(candHandle);
-      return assocMap_;
     }
 
     void insert(reco::RecoEcalCandidateRef& ref, const HGCalShowerShapeHelper::ShowerWidths& showerWidths) {
       assocMap_->insert(ref, showerWidths.*var_);
     }
 
-    std::unique_ptr<reco::RecoEcalCandidateIsolationMap>& operator()() { return assocMap_; }
+    std::unique_ptr<reco::RecoEcalCandidateIsolationMap> releaseMap() { return std::move(assocMap_); }
     const std::string& name() const { return name_; }
 
   private:
@@ -126,7 +124,7 @@ void EgammaHLTHGCalIDVarProducer::produce(edm::Event& iEvent, const edm::EventSe
   iEvent.put(std::move(rVarMap), "rVar");
   iEvent.put(std::move(hForHoverEMap), "hForHOverE");
   for (auto& pcaMap : pcaAssocMaps_) {
-    iEvent.put(std::move(pcaMap()), pcaMap.name());
+    iEvent.put(pcaMap.releaseMap(), pcaMap.name());
   }
 }