Merge pull request #14825 from jshlee/MuonSegFit-bugfix

MuonSegFit bugfix
cms-sw · Jun 10, 2016 · a9388aa · a9388aa
2 parents 4882fdf + e3006ed
commit a9388aa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/RecoLocalMuon/GEMSegment/plugins/GEMSegmentAlgorithm.cc b/RecoLocalMuon/GEMSegment/plugins/GEMSegmentAlgorithm.cc
@@ -311,7 +311,7 @@ bool GEMSegmentAlgorithm::isGoodToMerge(const GEMEnsemble& ensemble, const Ensem
 void GEMSegmentAlgorithm::buildSegments(const GEMEnsemble& ensemble, const EnsembleHitContainer& rechits, std::vector<GEMSegment>& gemsegs) {
   if (rechits.size() < minHitsPerSegment) return;
 
-  MuonRecHitContainer muonRecHits;
+  MuonSegFit::MuonRecHitContainer muonRecHits;
   proto_segment.clear();
 
   // select hits from the ensemble and sort it
@@ -326,7 +326,8 @@ void GEMSegmentAlgorithm::buildSegments(const GEMEnsemble& ensemble, const Ensem
 
     GEMRecHit *newRH = (*rh)->clone();
     newRH->setPosition(lp);
-    muonRecHits.push_back(newRH);
+    MuonSegFit::MuonRecHitPtr trkRecHit(newRH);
+    muonRecHits.push_back(trkRecHit);
   }
 
   #ifdef EDM_ML_DEBUG // have lines below only compiled when in debug mode 
@@ -344,7 +345,6 @@ void GEMSegmentAlgorithm::buildSegments(const GEMEnsemble& ensemble, const Ensem
   bool goodfit = sfit_->fit();
   edm::LogVerbatim("GEMSegmentAlgorithm") << "[GEMSegmentAlgorithm::buildSegments] GEMSegment fit done :: fit is good = "<<goodfit;
 
-  for (auto rh:muonRecHits) delete rh;
   // quit function if fit was not OK
   if(!goodfit) return;
 
@@ -393,6 +393,7 @@ void GEMSegmentAlgorithm::buildSegments(const GEMEnsemble& ensemble, const Ensem
   edm::LogVerbatim("GEMSegmentAlgorithm") << "[GEMSegmentAlgorithm::buildSegments] GEMSegment made in "<<tmp.gemDetId();
   edm::LogVerbatim("GEMSegmentAlgorithm") << "[GEMSegmentAlgorithm::buildSegments] "<<tmp;
 
+  for (auto rh:muonRecHits) rh.reset();  
   gemsegs.push_back(tmp);
 }
 

diff --git a/RecoLocalMuon/GEMSegment/plugins/GEMSegmentAlgorithm.h b/RecoLocalMuon/GEMSegment/plugins/GEMSegmentAlgorithm.h
@@ -29,8 +29,7 @@ class GEMSegmentAlgorithm : public GEMSegmentAlgorithmBase {
   /// Typedefs
   typedef std::vector<const GEMRecHit*> EnsembleHitContainer;
   typedef std::vector<EnsembleHitContainer> ProtoSegments;
-  typedef std::vector<const TrackingRecHit*> MuonRecHitContainer;
-
+
   /// Constructor
   explicit GEMSegmentAlgorithm(const edm::ParameterSet& ps);
   /// Destructor

diff --git a/RecoLocalMuon/GEMSegment/plugins/ME0SegmentAlgorithm.cc b/RecoLocalMuon/GEMSegment/plugins/ME0SegmentAlgorithm.cc
@@ -297,7 +297,7 @@ void ME0SegmentAlgorithm::buildSegments(const ME0Ensemble& ensemble, const Ensem
   }
 #endif
 
-  MuonRecHitContainer muonRecHits;
+  MuonSegFit::MuonRecHitContainer muonRecHits;
   proto_segment.clear();
 
   uint32_t refid = ensemble.second.begin()->first;
@@ -312,8 +312,10 @@ void ME0SegmentAlgorithm::buildSegments(const ME0Ensemble& ensemble, const Ensem
     const LocalPoint lp = refPart->toLocal(gp);    
     ME0RecHit *newRH = (*rh)->clone();
     newRH->setPosition(lp);
-
-    muonRecHits.push_back(newRH);    
+
+    MuonSegFit::MuonRecHitPtr trkRecHit(newRH);
+    muonRecHits.push_back(trkRecHit);
+    //muonRecHits.push_back(newRH);
   }
 
   // The actual fit on all hits of the vector of the selected Tracking RecHits:
@@ -322,7 +324,6 @@ void ME0SegmentAlgorithm::buildSegments(const ME0Ensemble& ensemble, const Ensem
   sfit_->fit();
   edm::LogVerbatim("ME0SegmentAlgorithm") << "[ME0SegmentAlgorithm::buildSegments] ME0Segment fit done";
 
-  for (auto rh:muonRecHits) delete rh;
   // quit function if fit was not OK  
   //if(!goodfit) return;
 
@@ -352,6 +353,7 @@ void ME0SegmentAlgorithm::buildSegments(const ME0Ensemble& ensemble, const Ensem
   edm::LogVerbatim("ME0SegmentAlgorithm") << "[ME0SegmentAlgorithm::buildSegments] ME0Segment made";
   edm::LogVerbatim("ME0SegmentAlgorithm") << "[ME0SegmentAlgorithm::buildSegments] "<<tmp;
 
+  for (auto rh:muonRecHits) rh.reset();
   me0segs.push_back(tmp);
   return;
 }

diff --git a/RecoLocalMuon/GEMSegment/plugins/ME0SegmentAlgorithm.h b/RecoLocalMuon/GEMSegment/plugins/ME0SegmentAlgorithm.h
@@ -29,7 +29,6 @@ class ME0SegmentAlgorithm : public ME0SegmentAlgorithmBase {
   /// Typedefs
   typedef std::vector<const ME0RecHit*> EnsembleHitContainer;
   typedef std::vector<EnsembleHitContainer> ProtoSegments;
-  typedef std::vector<const TrackingRecHit*> MuonRecHitContainer;
 
   /// Constructor
   explicit ME0SegmentAlgorithm(const edm::ParameterSet& ps);

diff --git a/RecoLocalMuon/GEMSegment/plugins/MuonSegFit.h b/RecoLocalMuon/GEMSegment/plugins/MuonSegFit.h
@@ -37,8 +37,10 @@ class MuonSegFit {
  public:
 
   // TYPES
-  typedef std::vector<const TrackingRecHit*> MuonRecHitContainer;
-
+  //typedef std::vector<const TrackingRecHit*> MuonRecHitContainer;
+  typedef std::shared_ptr<TrackingRecHit> MuonRecHitPtr;
+  typedef std::vector<MuonRecHitPtr> MuonRecHitContainer;
+
   // 12 x12 Symmetric
   typedef ROOT::Math::SMatrix<double,12,12,ROOT::Math::MatRepSym<double,12> > SMatrixSym12;