refs #9401. Rename algorithm to better reflect job.

mantidproject · May 13, 2014 · 1eb228c · 1eb228c
1 parent fb7976c
commit 1eb228c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -205,7 +205,7 @@ set ( SRC_FILES
 	src/SortEvents.cpp
 	src/SpatialGrouping.cpp
 	src/SpecularReflectionAlgorithm.cpp
-	src/SpecularReflectionCorrectTheta.cpp
+	src/SpecularReflectionCalculateTheta.cpp
 	src/SpecularReflectionPositionCorrect.cpp
 	src/SphericalAbsorption.cpp
 	src/StripPeaks.cpp
@@ -437,7 +437,7 @@ set ( INC_FILES
 	inc/MantidAlgorithms/SortEvents.h
 	inc/MantidAlgorithms/SpatialGrouping.h
 	inc/MantidAlgorithms/SpecularReflectionAlgorithm.h
-	inc/MantidAlgorithms/SpecularReflectionCorrectTheta.h
+	inc/MantidAlgorithms/SpecularReflectionCalculateTheta.h
 	inc/MantidAlgorithms/SpecularReflectionPositionCorrect.h
 	inc/MantidAlgorithms/SphericalAbsorption.h
 	inc/MantidAlgorithms/StripPeaks.h
@@ -659,7 +659,7 @@ set ( TEST_FILES
 	SolidAngleTest.h
 	SortEventsTest.h
 	SpatialGroupingTest.h
-	SpecularReflectionCorrectThetaTest.h
+	SpecularReflectionCalculateThetaTest.h
 	SpecularReflectionPositionCorrectTest.h
 	SphericalAbsorptionTest.h
 	StripPeaksTest.h

diff --git a/...gorithms/SpecularReflectionCorrectTheta.h → ...rithms/SpecularReflectionCalculateTheta.h b/...gorithms/SpecularReflectionCorrectTheta.h → ...rithms/SpecularReflectionCalculateTheta.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_ALGORITHMS_SPECULARREFLECTIONCORRECTTHETA_H_
-#define MANTID_ALGORITHMS_SPECULARREFLECTIONCORRECTTHETA_H_
+#ifndef MANTID_ALGORITHMS_SPECULARREFLECTIONCALCULATETHETA_H_
+#define MANTID_ALGORITHMS_SPECULARREFLECTIONCALCULATETHETA_H_
 
 #include "MantidKernel/System.h"
 #include "MantidAPI/Algorithm.h"
@@ -32,11 +32,11 @@ namespace Algorithms
     File change history is stored at: <https://github.com/mantidproject/mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
-  class DLLExport SpecularReflectionCorrectTheta  : public SpecularReflectionAlgorithm
+  class DLLExport SpecularReflectionCalculateTheta  : public SpecularReflectionAlgorithm
   {
   public:
-    SpecularReflectionCorrectTheta();
-    virtual ~SpecularReflectionCorrectTheta();
+    SpecularReflectionCalculateTheta();
+    virtual ~SpecularReflectionCalculateTheta();
 
     virtual const std::string name() const;
     virtual int version() const;
@@ -54,4 +54,4 @@ namespace Algorithms
 } // namespace Algorithms
 } // namespace Mantid
 
-#endif  /* MANTID_ALGORITHMS_SPECULARREFLECTIONCORRECTTHETA_H_ */
+#endif  /* MANTID_ALGORITHMS_SPECULARREFLECTIONCALCULATETHETA_H_ */
diff --git a/...ms/src/SpecularReflectionCorrectTheta.cpp → .../src/SpecularReflectionCalculateTheta.cpp b/...ms/src/SpecularReflectionCorrectTheta.cpp → .../src/SpecularReflectionCalculateTheta.cpp
@@ -12,7 +12,7 @@ Also see [[SpecularReflectionPositionCorrect]]
 
 *WIKI*/
 
-#include "MantidAlgorithms/SpecularReflectionCorrectTheta.h"
+#include "MantidAlgorithms/SpecularReflectionCalculateTheta.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/Instrument.h"
@@ -36,46 +36,46 @@ namespace Mantid
   {
 
     // Register the algorithm into the AlgorithmFactory
-    DECLARE_ALGORITHM(SpecularReflectionCorrectTheta)
+    DECLARE_ALGORITHM(SpecularReflectionCalculateTheta)
 
     //----------------------------------------------------------------------------------------------
     /** Constructor
      */
-    SpecularReflectionCorrectTheta::SpecularReflectionCorrectTheta()
+    SpecularReflectionCalculateTheta::SpecularReflectionCalculateTheta()
     {
     }
 
     //----------------------------------------------------------------------------------------------
     /** Destructor
      */
-    SpecularReflectionCorrectTheta::~SpecularReflectionCorrectTheta()
+    SpecularReflectionCalculateTheta::~SpecularReflectionCalculateTheta()
     {
     }
 
     //----------------------------------------------------------------------------------------------
     /// Algorithm's name for identification. @see Algorithm::name
-    const std::string SpecularReflectionCorrectTheta::name() const
+    const std::string SpecularReflectionCalculateTheta::name() const
     {
-      return "SpecularReflectionCorrectTheta";
+      return "SpecularReflectionCalculateTheta";
     }
     ;
 
     /// Algorithm's version for identification. @see Algorithm::version
-    int SpecularReflectionCorrectTheta::version() const
+    int SpecularReflectionCalculateTheta::version() const
     {
       return 1;
     }
     ;
 
     /// Algorithm's category for identification. @see Algorithm::category
-    const std::string SpecularReflectionCorrectTheta::category() const
+    const std::string SpecularReflectionCalculateTheta::category() const
     {
       return "Reflectometry\\ISIS";
     }
 
     //----------------------------------------------------------------------------------------------
     /// Sets documentation strings for this algorithm
-    void SpecularReflectionCorrectTheta::initDocs()
+    void SpecularReflectionCalculateTheta::initDocs()
     {
       this->setWikiSummary(
           "Calculate the specular reflection two theta scattering angle (degrees) from the detector and sample locations .");
@@ -85,7 +85,7 @@ namespace Mantid
     //----------------------------------------------------------------------------------------------
     /** Initialize the algorithm's properties.
      */
-    void SpecularReflectionCorrectTheta::init()
+    void SpecularReflectionCalculateTheta::init()
     {
       declareProperty(new WorkspaceProperty<MatrixWorkspace>("InputWorkspace", "", Direction::Input),
           "An Input workspace to calculate the specular relection theta on.");
@@ -98,7 +98,7 @@ namespace Mantid
     //----------------------------------------------------------------------------------------------
     /** Execute the algorithm.
      */
-    void SpecularReflectionCorrectTheta::exec()
+    void SpecularReflectionCalculateTheta::exec()
     {
       MatrixWorkspace_sptr inWS = this->getProperty("InputWorkspace");
 

diff --git a/...test/SpecularReflectionCorrectThetaTest.h → ...st/SpecularReflectionCalculateThetaTest.h b/...test/SpecularReflectionCorrectThetaTest.h → ...st/SpecularReflectionCalculateThetaTest.h
@@ -6,20 +6,20 @@
 #include "SpecularReflectionAlgorithmTest.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"
 
-#include "MantidAlgorithms/SpecularReflectionCorrectTheta.h"
+#include "MantidAlgorithms/SpecularReflectionCalculateTheta.h"
 
 using namespace Mantid::Algorithms;
 using namespace Mantid::API;
 
-class SpecularReflectionCorrectThetaTest: public CxxTest::TestSuite,
+class SpecularReflectionCalculateThetaTest: public CxxTest::TestSuite,
     public SpecularReflectionAlgorithmTest
 {
 
 private:
 
   Mantid::API::IAlgorithm_sptr makeAlgorithm() const
   {
-    IAlgorithm_sptr alg = boost::make_shared<SpecularReflectionCorrectTheta>();
+    IAlgorithm_sptr alg = boost::make_shared<SpecularReflectionCalculateTheta>();
     alg->setRethrows(true);
     alg->setChild(true);
     alg->initialize();
@@ -29,23 +29,23 @@ class SpecularReflectionCorrectThetaTest: 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 SpecularReflectionCorrectThetaTest *createSuite()
+  static SpecularReflectionCalculateThetaTest *createSuite()
   {
-    return new SpecularReflectionCorrectThetaTest();
+    return new SpecularReflectionCalculateThetaTest();
   }
-  static void destroySuite(SpecularReflectionCorrectThetaTest *suite)
+  static void destroySuite(SpecularReflectionCalculateThetaTest *suite)
   {
     delete suite;
   }
 
   void test_Init()
   {
-    SpecularReflectionCorrectTheta alg;
+    SpecularReflectionCalculateTheta alg;
     TS_ASSERT_THROWS_NOTHING( alg.initialize())
     TS_ASSERT( alg.isInitialized())
   }
 
-  SpecularReflectionCorrectThetaTest()
+  SpecularReflectionCalculateThetaTest()
   {
   }