refs #4013 Fix conversion error. Second attempt.

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

Hide file tree

Showing 5 changed files with 6 additions and 6 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 unsigned int nNeighbours) const;
+      std::map<specid_t, double> getNeighbours(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 unsigned int nNeighbours) const
+    std::map<specid_t, double> MatrixWorkspace::getNeighbours(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
@@ -55,7 +55,7 @@ namespace Algorithms
   {
     MatrixWorkspace_sptr sampleWS = getProperty("SampleInputWorkspace");
     MatrixWorkspace_sptr vanadiumWS = getProperty("VanadiumInputWorkspace");
-    unsigned int uNeighbours = static_cast<unsigned int>(getProperty("NumberOfNeighbours"));
+    int neighbours = getProperty("NumberOfNeighbours");
     if(sampleWS->getXDimension()->getNBins() != vanadiumWS->getXDimension()->getNBins())
     {
       throw std::runtime_error("Sample and Vanadium workspaces do not have the same number of bins.");
@@ -92,7 +92,7 @@ namespace Algorithms
         PARALLEL_CRITICAL(NearestNeighboursSearch)
         {
           //CPUTimer tim;
-          specIdMap = vanadiumWS->getNeighbours(inSpec, uNeighbours); //This is not threadsafe!
+          specIdMap = vanadiumWS->getNeighbours(inSpec, neighbours); //This is not threadsafe!
          // std::cout << tim << " to get nearest neighbours." << std::endl;
         }
         std::map<specid_t, double>::iterator it = specIdMap.begin();

diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h
@@ -79,7 +79,7 @@ namespace Mantid
       std::map<specid_t, double> neighbours(const specid_t spectrum, const double radius=0.0) const;
 
       // Neighbouring spectra by 
-      std::map<specid_t, double> neighbours(const specid_t spectrum, bool force, const unsigned int numberofneighbours=8) const;
+      std::map<specid_t, double> neighbours(const specid_t spectrum, bool force, const int numberofneighbours=8) const;
 
     private:
       /// typedef for Graph object used to hold the calculated information

diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/NearestNeighbours.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/NearestNeighbours.cpp
@@ -36,7 +36,7 @@ namespace Mantid
      * @return map of Detector ID's to distance
      * @throw NotFoundError if component is not recognised as a detector
      */
-    std::map<specid_t, double> NearestNeighbours::neighbours(const specid_t spectrum,  bool force, const unsigned int noNeighbours) const
+    std::map<specid_t, double> NearestNeighbours::neighbours(const specid_t spectrum,  bool force, const int noNeighbours) const
     {
       if(force || m_noNeighbours != int(noNeighbours))
       {