refs #5016. Fix class names.

mantidproject · May 29, 2012 · 1f68967 · 1f68967
1 parent 8bc5b71
commit 1f68967
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 28 deletions.
diff --git a/Code/Mantid/Framework/MDEvents/CMakeLists.txt b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
@@ -35,7 +35,7 @@ set ( SRC_FILES
 	src/MDWSTransfDescr.cpp
 	src/OneStepMDEW.cpp
 	src/QueryMDWorkspace.cpp
-	src/ReflectometryTranformQxQz.cpp
+	src/ReflectometryTransformQxQz.cpp
 	src/SaveMD.cpp
 	src/SliceMD.cpp
 	src/SlicingAlgorithm.cpp
@@ -89,7 +89,7 @@ set ( INC_FILES
 	inc/MantidMDEvents/MDWSTransfDescr.h
 	inc/MantidMDEvents/OneStepMDEW.h
 	inc/MantidMDEvents/QueryMDWorkspace.h
-	inc/MantidMDEvents/ReflectometryTranformQxQz.h
+	inc/MantidMDEvents/ReflectometryTransformQxQz.h
 	inc/MantidMDEvents/ReflectometryMDTransform.h
 	inc/MantidMDEvents/SaveMD.h
 	inc/MantidMDEvents/SkippingPolicy.h
@@ -135,7 +135,7 @@ set ( TEST_FILES
 	test/MDWSTransfDescrTest.h
 	test/OneStepMDEWTest.h
 	test/QueryMDWorkspaceTest.h
-	test/ReflectometryTranformQxQzTest.h
+	test/ReflectometryTransformQxQzTest.h
 	test/SaveMDTest.h
 	test/SkippingPolicyTest.h
 	test/SliceMDTest.h

diff --git a/...antidMDEvents/ReflectometryTranformQxQz.h → ...ntidMDEvents/ReflectometryTransformQxQz.h b/...antidMDEvents/ReflectometryTranformQxQz.h → ...ntidMDEvents/ReflectometryTransformQxQz.h
@@ -35,7 +35,7 @@ namespace MDEvents
     File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
     */
-  class DLLExport ReflectometryTranformQxQz : public ReflectometryMDTransform
+  class DLLExport ReflectometryTransformQxQz : public ReflectometryMDTransform
   {
   private:
     const double m_qxMin;
@@ -46,16 +46,16 @@ namespace MDEvents
   public:
 
     /// Constructor
-    ReflectometryTranformQxQz(double qxMin, double qxMax, double qzMin, double qzMax, double incidentTheta);
+    ReflectometryTransformQxQz(double qxMin, double qxMax, double qzMin, double qzMax, double incidentTheta);
     /// Destructor
-    ~ReflectometryTranformQxQz();
+    ~ReflectometryTransformQxQz();
     /// Execute transformation
     virtual Mantid::API::IMDEventWorkspace_sptr execute(Mantid::API::IEventWorkspace_const_sptr eventWs) const;
 
   private:
 
-    DISABLE_DEFAULT_CONSTRUCT(ReflectometryTranformQxQz)
-    DISABLE_COPY_AND_ASSIGN(ReflectometryTranformQxQz)
+    DISABLE_DEFAULT_CONSTRUCT(ReflectometryTransformQxQz)
+    DISABLE_COPY_AND_ASSIGN(ReflectometryTransformQxQz)
 
   };
 

diff --git a/Code/Mantid/Framework/MDEvents/src/ConvertToReflectometryQ.cpp b/Code/Mantid/Framework/MDEvents/src/ConvertToReflectometryQ.cpp
@@ -14,7 +14,7 @@ TODO: Enter a full wiki-markup description of your algorithm here. You can then
 #include "MantidAPI/IEventWorkspace.h"
 #include "MantidMDEvents/MDEventWorkspace.h"
 #include "MantidMDEvents/MDEventFactory.h"
-#include "MantidMDEvents/ReflectometryTranformQxQz.h"
+#include "MantidMDEvents/ReflectometryTransformQxQz.h"
 #include "MantidMDEvents/ReflectometryMDTransform.h"
 
 #include <boost/scoped_ptr.hpp>
@@ -281,7 +281,7 @@ namespace MDEvents
     boost::scoped_ptr<ReflectometryMDTransform> transform(NULL);
     if(outputDimensions == qSpaceTransform())
     {
-      transform.swap(boost::scoped_ptr<ReflectometryMDTransform>(new ReflectometryTranformQxQz(qxmin, qxmax, qzmin, qzmax, incidentTheta)));
+      transform.swap(boost::scoped_ptr<ReflectometryMDTransform>(new ReflectometryTransformQxQz(qxmin, qxmax, qzmin, qzmax, incidentTheta)));
     }
     else if(outputDimensions == pSpaceTransform())
     {

diff --git a/...DEvents/src/ReflectometryTranformQxQz.cpp → ...Events/src/ReflectometryTransformQxQz.cpp b/...DEvents/src/ReflectometryTranformQxQz.cpp → ...Events/src/ReflectometryTransformQxQz.cpp
@@ -1,4 +1,4 @@
-#include "MantidMDEvents/ReflectometryTranformQxQz.h"
+#include "MantidMDEvents/ReflectometryTransformQxQz.h"
 #include "MantidMDEvents/MDEventWorkspace.h"
 #include "MantidGeometry/MDGeometry/MDHistoDimension.h"
 #include <stdexcept>
@@ -15,7 +15,7 @@ namespace Mantid
     //----------------------------------------------------------------------------------------------
     /** Destructor
     */
-    ReflectometryTranformQxQz::~ReflectometryTranformQxQz()
+    ReflectometryTransformQxQz::~ReflectometryTransformQxQz()
     {
     }
 
@@ -27,7 +27,7 @@ namespace Mantid
     @param qzMax; max qz value (extent)
     @param incidentTheta: Predetermined incident theta value
     */
-    ReflectometryTranformQxQz::ReflectometryTranformQxQz(double qxMin, double qxMax, double qzMin, double qzMax, double incidentTheta):
+    ReflectometryTransformQxQz::ReflectometryTransformQxQz(double qxMin, double qxMax, double qzMin, double qzMax, double incidentTheta):
     m_qxMin(qxMin), m_qxMax(qxMax), m_qzMin(qzMin), m_qzMax(qzMax), m_incidentTheta(incidentTheta)
     {
       if(qxMin >= qxMax)
@@ -49,7 +49,7 @@ namespace Mantid
     @return the constructed IMDEventWorkspace following the transformation.
     @param ws: Input EventWorkspace const shared pointer
     */
-    IMDEventWorkspace_sptr ReflectometryTranformQxQz::execute(IEventWorkspace_const_sptr eventWs) const
+    IMDEventWorkspace_sptr ReflectometryTransformQxQz::execute(IEventWorkspace_const_sptr eventWs) const
     {
       const size_t nbinsx = 10;
       const size_t nbinsz = 10;

diff --git a/...ents/test/ReflectometryTranformQxQzTest.h → ...nts/test/ReflectometryTransformQxQzTest.h b/...ents/test/ReflectometryTranformQxQzTest.h → ...nts/test/ReflectometryTransformQxQzTest.h
@@ -7,19 +7,19 @@
 #include <iostream>
 #include <iomanip>
 
-#include "MantidMDEvents/ReflectometryTranformQxQz.h"
+#include "MantidMDEvents/ReflectometryTransformQxQz.h"
 
 using namespace Mantid;
 using namespace Mantid::MDEvents;
 using namespace Mantid::API;
 
-class ReflectometryTranformQxQzTest : public CxxTest::TestSuite
+class ReflectometryTransformQxQzTest : public CxxTest::TestSuite
 {
 public:
   // This pair of boilerplate methods prevent the suite being created statically
   // This means the constructor isn't called when running other tests
-  static ReflectometryTranformQxQzTest *createSuite() { return new ReflectometryTranformQxQzTest(); }
-  static void destroySuite( ReflectometryTranformQxQzTest *suite ) { delete suite; }
+  static ReflectometryTransformQxQzTest *createSuite() { return new ReflectometryTransformQxQzTest(); }
+  static void destroySuite( ReflectometryTransformQxQzTest *suite ) { delete suite; }
 
 
   void test_qxmin_greater_than_qxmax_throws()
@@ -29,7 +29,7 @@ class ReflectometryTranformQxQzTest : public CxxTest::TestSuite
     double qzMin = 1;
     double qzMax = 2;
     double incidentTheta = 1;
-    TS_ASSERT_THROWS(ReflectometryTranformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::invalid_argument);
+    TS_ASSERT_THROWS(ReflectometryTransformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::invalid_argument);
   }
 
   void test_qxmin_equal_to_qxmax_throws()
@@ -39,7 +39,7 @@ class ReflectometryTranformQxQzTest : public CxxTest::TestSuite
     double qzMin = 1;
     double qzMax = 2;
     double incidentTheta = 1;
-    TS_ASSERT_THROWS(ReflectometryTranformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::invalid_argument);
+    TS_ASSERT_THROWS(ReflectometryTransformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::invalid_argument);
   }
 
   void test_qzmin_greater_than_qzmax_throws()
@@ -49,7 +49,7 @@ class ReflectometryTranformQxQzTest : public CxxTest::TestSuite
     double qzMin = 2;
     double qzMax = 1; //Smaller than qzMin!
     double incidentTheta = 1;
-    TS_ASSERT_THROWS(ReflectometryTranformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::invalid_argument);
+    TS_ASSERT_THROWS(ReflectometryTransformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::invalid_argument);
   }
 
   void test_qzmin_equal_to_qzmax_throws()
@@ -59,7 +59,7 @@ class ReflectometryTranformQxQzTest : public CxxTest::TestSuite
     double qzMin = 1;
     double qzMax = 1; //Equal to qzMin!
     double incidentTheta = 1;
-    TS_ASSERT_THROWS(ReflectometryTranformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::invalid_argument);
+    TS_ASSERT_THROWS(ReflectometryTransformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::invalid_argument);
   }
 
   void test_incident_theta_negative()
@@ -69,7 +69,7 @@ class ReflectometryTranformQxQzTest : public CxxTest::TestSuite
     double qzMin = 1;
     double qzMax = 3; 
     double incidentTheta = -0.001; //Negative
-    TS_ASSERT_THROWS(ReflectometryTranformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::out_of_range);
+    TS_ASSERT_THROWS(ReflectometryTransformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::out_of_range);
   }
 
   void test_incident_theta_too_large()
@@ -79,7 +79,7 @@ class ReflectometryTranformQxQzTest : public CxxTest::TestSuite
     double qzMin = 1;
     double qzMax = 3; 
     double incidentTheta = 90.001; //Too large
-    TS_ASSERT_THROWS(ReflectometryTranformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::out_of_range);
+    TS_ASSERT_THROWS(ReflectometryTransformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta), std::out_of_range);
   }
 
   void test_valid_construction_inputs()
@@ -89,12 +89,9 @@ class ReflectometryTranformQxQzTest : public CxxTest::TestSuite
     double qzMin = 1;
     double qzMax = 2;
     double incidentTheta = 1;
-    TS_ASSERT_THROWS_NOTHING(ReflectometryTranformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta));
+    TS_ASSERT_THROWS_NOTHING(ReflectometryTransformQxQz(qxMin, qxMax, qzMin, qzMax, incidentTheta));
   }
 
-  void 
-
-
 };