Fixed bug reported by Yang Kyun Park caused by several projections

having the same gantry angle next to the angular gap http://public.kitware.com/pipermail/rtk-users/2014-September/000243.html
SimonRit · Sep 9, 2014 · c5b1647 · c5b1647
1 parent 16eab76
commit c5b1647
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/code/rtkParkerShortScanImageFilter.txx b/code/rtkParkerShortScanImageFilter.txx
@@ -84,7 +84,7 @@ ParkerShortScanImageFilter<TInputImage, TOutputImage>
   typename itk::ImageRegionIteratorWithIndex<WeightImageType> itWeights(weights, weights->GetLargestPossibleRegion() );
 
   const std::vector<double> rotationAngles = m_Geometry->GetGantryAngles();
-  const std::multimap<double,unsigned int> sortedAngles = m_Geometry->GetSortedAngles( m_Geometry->GetGantryAngles() );
+  const std::map<double,unsigned int> sortedAngles = m_Geometry->GetUniqueSortedAngles( m_Geometry->GetGantryAngles() );
 
   // Compute delta between first and last angle where there is weighting required
   // First angle

diff --git a/code/rtkThreeDCircularProjectionGeometry.cxx b/code/rtkThreeDCircularProjectionGeometry.cxx
@@ -147,6 +147,18 @@ const std::multimap<double,unsigned int> rtk::ThreeDCircularProjectionGeometry::
   return sangles;
 }
 
+const std::map<double,unsigned int> rtk::ThreeDCircularProjectionGeometry::GetUniqueSortedAngles(const std::vector<double> &angles)
+{
+  unsigned int nProj = angles.size();
+  std::map<double,unsigned int> sangles;
+  for(unsigned int iProj=0; iProj<nProj; iProj++)
+    {
+    double angle = angles[iProj];
+    sangles.insert(std::pair<double, unsigned int>(angle, iProj) );
+    }
+  return sangles;
+}
+
 const std::vector<double> rtk::ThreeDCircularProjectionGeometry::GetAngularGapsWithNext(const std::vector<double> &angles)
 {
   std::vector<double> angularGaps;

diff --git a/code/rtkThreeDCircularProjectionGeometry.h b/code/rtkThreeDCircularProjectionGeometry.h
@@ -118,10 +118,14 @@ class RTK_EXPORT ThreeDCircularProjectionGeometry : public ProjectionGeometry<3>
    * defined as the difference between -GantryAngle and the SourceAngle. */
   const std::vector<double> GetTiltAngles();
 
-  /** Get a multimap containing all sorted angles in radiansand corresponding
+  /** Get a multimap containing all sorted angles in radians and corresponding
    * index. */
   const std::multimap<double,unsigned int> GetSortedAngles(const std::vector<double> &angles);
 
+  /** Get a map containing unique sorted angles in radians and corresponding
+   * index. */
+  const std::map<double,unsigned int> GetUniqueSortedAngles(const std::vector<double> &angles);
+
   /** Get for each projection the angular gaps with next projection in radians. */
   const std::vector<double> GetAngularGapsWithNext(const std::vector<double> &angles);