refs #7386. Rename functions.

mantidproject · Jul 4, 2013 · 597dc38 · 597dc38
1 parent b2d1be3
commit 597dc38
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IPeak.h b/Code/Mantid/Framework/API/inc/MantidAPI/IPeak.h
@@ -46,7 +46,7 @@ namespace API
     virtual void setHKL(double H, double K, double L) = 0;
     virtual void setHKL(Mantid::Kernel::V3D HKL) = 0;
     virtual Mantid::Kernel::V3D getDetectorPosition() const = 0;
-    virtual Mantid::Kernel::V3D getDetectorPositionSafe() const = 0;
+    virtual Mantid::Kernel::V3D getDetectorPositionNoCheck() const = 0;
 
     virtual Mantid::Kernel::V3D getQLabFrame() const = 0;
     virtual Mantid::Kernel::V3D getQSampleFrame() const = 0;

diff --git a/Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/Peak.h b/Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/Peak.h
@@ -70,7 +70,7 @@ namespace DataObjects
     Mantid::Kernel::V3D getQLabFrame() const;
     Mantid::Kernel::V3D getQSampleFrame() const;
     Mantid::Kernel::V3D getDetectorPosition() const;
-    Mantid::Kernel::V3D getDetectorPositionSafe() const;
+    Mantid::Kernel::V3D getDetectorPositionNoCheck() const;
 
     void setQSampleFrame(Mantid::Kernel::V3D QSampleFrame, double detectorDistance=1.0);
     void setQLabFrame(Mantid::Kernel::V3D QLabFrame, double detectorDistance=1.0);

diff --git a/Code/Mantid/Framework/DataObjects/src/Peak.cpp b/Code/Mantid/Framework/DataObjects/src/Peak.cpp
@@ -807,7 +807,7 @@ namespace DataObjects
   /**
   Forwarding function. Exposes the detector position directly.
   */
-  Mantid::Kernel::V3D Peak::getDetectorPosition() const
+  Mantid::Kernel::V3D Peak::getDetectorPositionNoCheck() const
   {
     return getDetector()->getPos();
   }
@@ -816,7 +816,7 @@ namespace DataObjects
   Forwarding function. Exposes the detector position directly, but checks that the detector is not null before
   accessing its position. Throws if null.
   */
-  Mantid::Kernel::V3D Peak::getDetectorPositionSafe() const
+  Mantid::Kernel::V3D Peak::getDetectorPosition() const
   {
     auto det = getDetector();
     if(det == NULL)

diff --git a/Code/Mantid/Framework/DataObjects/test/PeakTest.h b/Code/Mantid/Framework/DataObjects/test/PeakTest.h
@@ -330,14 +330,14 @@ class PeakTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( p2.getDetectorID(), 19999);
   }
 
-  void test_getDetectorPositionSafe()
+  void test_getDetectorPosition()
   {
     const int detectorId = 19999;
     const double wavelength = 2;
     Peak p(inst, detectorId, wavelength);
 
     V3D a = p.getDetectorPosition();
-    V3D b = p.getDetectorPositionSafe();
+    V3D b = p.getDetectorPositionNoCheck();
 
     TSM_ASSERT_EQUALS("Results should be the same", a, b);
   }
@@ -347,9 +347,9 @@ class PeakTest : public CxxTest::TestSuite
     const int detectorId = 19999;
     const double wavelength = 2;
     Peak p(inst, detectorId, wavelength);
-    TSM_ASSERT_THROWS_NOTHING("Nothing wrong here, detector is valid", p.getDetectorPositionSafe());
+    TSM_ASSERT_THROWS_NOTHING("Nothing wrong here, detector is valid", p.getDetectorPosition());
     p.setQLabFrame(V3D(1,1,1), 1); // This sets the detector pointer to null and detector id to -1;
-    TSM_ASSERT_THROWS("Detector is not valid", p.getDetectorPositionSafe(), Mantid::Kernel::Exception::NotFoundError&);
+    TSM_ASSERT_THROWS("Detector is not valid", p.getDetectorPosition(), Mantid::Kernel::Exception::NotFoundError&);
   }
 
 private:

diff --git a/Code/Mantid/MantidQt/SliceViewer/test/MockObjects.h b/Code/Mantid/MantidQt/SliceViewer/test/MockObjects.h
@@ -236,7 +236,7 @@ class MockPeakTransformFactory : public PeakTransformFactory
       double());
     MOCK_CONST_METHOD0(getDetectorPosition,
       Mantid::Kernel::V3D());
-    MOCK_CONST_METHOD0(getDetectorPositionSafe,
+    MOCK_CONST_METHOD0(getDetectorPositionNoCheck,
           Mantid::Kernel::V3D());
   };