refs #4013 Minor modifications including more realistic reporting.

mantidproject · Nov 3, 2011 · b0b5eae · b0b5eae
1 parent f2cfc76
commit b0b5eae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
@@ -98,7 +98,7 @@ namespace Mantid
       /// Query the NearestNeighbours object for a given spectrum index using a search radius
       std::map<specid_t, double> getNeighbours(specid_t spec, const double radius) const;
       /// Query the NearestNeighbours object for a given spectrum index using the direct number of nearest neighbours
-      std::map<specid_t, double> getNeighbours(specid_t spec, const int nNeighbours) const;
+      std::map<specid_t, double> getNeighboursExact(specid_t spec, const int nNeighbours) const;
       //@}
 
       /// Const access to the spectra-detector map

diff --git a/Code/Mantid/Framework/API/src/MatrixWorkspace.cpp b/Code/Mantid/Framework/API/src/MatrixWorkspace.cpp
@@ -381,7 +381,7 @@ namespace Mantid
      * @param nNeighbours :: unsigned int, number of neighbours to include.
      * @return map of DetectorID to distance for the nearest neighbours
      */
-    std::map<specid_t, double> MatrixWorkspace::getNeighbours(specid_t spec, const int nNeighbours) const
+    std::map<specid_t, double> MatrixWorkspace::getNeighboursExact(specid_t spec, const int nNeighbours) const
     {
       if ( !m_nearestNeighbours )
       {

diff --git a/Code/Mantid/Framework/Algorithms/src/NormaliseByVanadium.cpp b/Code/Mantid/Framework/Algorithms/src/NormaliseByVanadium.cpp
@@ -92,7 +92,7 @@ namespace Algorithms
         PARALLEL_CRITICAL(NearestNeighboursSearch)
         {
           //CPUTimer tim;
-          specIdMap = vanadiumWS->getNeighbours(inSpec, neighbours); //This is not threadsafe!
+          specIdMap = vanadiumWS->getNeighboursExact(inSpec, neighbours); //This is not threadsafe!
          // std::cout << tim << " to get nearest neighbours." << std::endl;
         }
         std::map<specid_t, double>::iterator it = specIdMap.begin();
@@ -118,7 +118,7 @@ namespace Algorithms
     vanSumTOF_WS = vanSumTOF_WS/yAvgWS;
 
     //Mask detectors outside of limits
-    IAlgorithm_sptr constrainAlg = this->createSubAlgorithm("FindDetectorsOutsideLimits", 0.80, 0.90, true, 1);
+    IAlgorithm_sptr constrainAlg = this->createSubAlgorithm("FindDetectorsOutsideLimits", 0.80, 0.85, true, 1);
     constrainAlg->setProperty("InputWorkspace", vanSumTOF_WS);
     constrainAlg->setPropertyValue("OutputWorkspace", "ConstrainedWS");
     constrainAlg->setProperty("HighThreshold", pow((double)10, (double)300));
@@ -127,13 +127,16 @@ namespace Algorithms
     MatrixWorkspace_sptr constrainedWS = constrainAlg->getProperty("OutputWorkspace");
 
     //Mask detectors outside of limits
-    IAlgorithm_sptr maskdetectorsAlg = this->createSubAlgorithm("MaskDetectors", 0.90, 1, true, 1);
+    IAlgorithm_sptr maskdetectorsAlg = this->createSubAlgorithm("MaskDetectors", 0.85, 0.90, true, 1);
     maskdetectorsAlg->setProperty("Workspace", vanSumTOF_WS);
     maskdetectorsAlg->setProperty("MaskedWorkspace", constrainedWS);
     maskdetectorsAlg->executeAsSubAlg();
 
+    //Divide the sample workspace by the smoothed vanadium workspace.
     sampleWS = sampleWS / vanSumTOF_WS;
 
+    progress.report(1, "Complete");
+    //Finally set the output workspace.
     setProperty("OutputWorkspace", sampleWS);
   }