Revert "Refs #9313 change for summing WISH data"

This reverts commit a7fb91d.
mantidproject · Apr 10, 2014 · 831aad9 · 831aad9
1 parent a7fb91d
commit 831aad9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/SmoothNeighbours.cpp b/Code/Mantid/Framework/Algorithms/src/SmoothNeighbours.cpp
@@ -435,7 +435,7 @@ void SmoothNeighbours::findNeighboursUbiqutious()
   // Go through every input workspace pixel
   outWI = 0;
   int sum = getProperty("SumNumberOfNeighbours");
-  boost::shared_ptr<const Geometry::IComponent> parent, neighbParent;
+  boost::shared_ptr<const Geometry::IComponent> parent, neighbParent, grandparent, neighbGParent;
   bool* used = new bool[inWS->getNumberHistograms()];
   if (sum > 1)
   {
@@ -459,6 +459,7 @@ void SmoothNeighbours::findNeighboursUbiqutious()
       if(sum > 1)
       {
         parent = det->getParent();
+        grandparent = parent->getParent();
       }
     }
     catch(Kernel::Exception::NotFoundError&)
@@ -501,7 +502,8 @@ void SmoothNeighbours::findNeighboursUbiqutious()
           if(sum > 1)
           {
             neighbParent = inWS->getDetector(neighWI)->getParent();
-            if(noNeigh >= sum || neighbParent->getName().compare(parent->getName()) > 0 || used[neighWI])continue;
+            neighbGParent = neighbParent->getParent();
+            if(noNeigh >= sum || neighbParent->getName().compare(parent->getName()) > 0 || neighbGParent->getName().compare(grandparent->getName()) > 0 || used[neighWI])continue;
             noNeigh++;
             used[neighWI] = true;
           }