Refs #4647 Removed PairedGroupAlgorithm

mantidproject · Jan 25, 2012 · 9191487 · 9191487
1 parent 1cadfc8
commit 9191487
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 97 deletions.
diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -59,7 +59,6 @@ set ( SRC_FILES
 	src/MultipleExperimentInfos.cpp
 	src/MultipleFileProperty.cpp
 	src/NumericAxis.cpp
-	src/PairedGroupAlgorithm.cpp
 	src/ParamFunction.cpp
 	src/ParameterReference.cpp
 	src/ParameterTie.cpp
@@ -172,7 +171,6 @@ set ( INC_FILES
 	inc/MantidAPI/MultipleExperimentInfos.h
 	inc/MantidAPI/MultipleFileProperty.h
 	inc/MantidAPI/NumericAxis.h
-	inc/MantidAPI/PairedGroupAlgorithm.h
 	inc/MantidAPI/ParamFunction.h
 	inc/MantidAPI/ParameterReference.h
 	inc/MantidAPI/ParameterTie.h

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/PairedGroupAlgorithm.h b/Code/Mantid/Framework/API/inc/MantidAPI/PairedGroupAlgorithm.h
diff --git a/Code/Mantid/Framework/API/src/PairedGroupAlgorithm.cpp b/Code/Mantid/Framework/API/src/PairedGroupAlgorithm.cpp
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
@@ -4,12 +4,12 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidAPI/PairedGroupAlgorithm.h"
+#include "MantidAPI/Algorithm.h"
+#include "MantidAPI/Run.h"
 #include "MantidAPI/Workspace.h"
 #include "MantidAPI/WorkspaceGroup.h"
-#include "MantidAPI/Run.h"
-#include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/EventList.h"
+#include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/System.h"
 
 namespace Mantid
@@ -64,7 +64,7 @@ namespace Mantid
 
     File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
     */
-    class DLLExport BinaryOperation : public API::PairedGroupAlgorithm
+    class DLLExport BinaryOperation : public API::Algorithm
     {
     public:
       /// Default constructor

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ConjoinWorkspaces.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ConjoinWorkspaces.h
@@ -4,7 +4,7 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidAPI/PairedGroupAlgorithm.h"
+#include "MantidAPI/Algorithm.h"
 #include "MantidDataObjects/EventWorkspace.h"
 
 namespace Mantid
@@ -48,7 +48,7 @@ namespace Algorithms
     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 ConjoinWorkspaces : public API::PairedGroupAlgorithm
+class DLLExport ConjoinWorkspaces : public API::Algorithm
 {
 public:
   /// Empty constructor

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/RebinToWorkspace.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/RebinToWorkspace.h
@@ -1,7 +1,7 @@
 #ifndef ALGORITHMS_REBINTOWORKSPACE_H_
 #define ALGORITHMS_REBINTOWORKSPACE_H_
 
-#include "MantidAPI/PairedGroupAlgorithm.h"
+#include "MantidAPI/Algorithm.h"
 #include "MantidAPI/MatrixWorkspace.h"
 
 namespace Mantid
@@ -44,11 +44,11 @@ namespace Algorithms
      Code Documentation is available at: <http://doxygen.mantidproject.org>    
   */
 
-class DLLExport RebinToWorkspace : public Mantid::API::PairedGroupAlgorithm
+class DLLExport RebinToWorkspace : public Mantid::API::Algorithm
 {
 public:
   /// Constructor
-  RebinToWorkspace() : Mantid::API::PairedGroupAlgorithm() {}
+  RebinToWorkspace() : Mantid::API::Algorithm() {}
   /// Virtual destructor
   virtual ~RebinToWorkspace() {}
   /// Algorithm's name

diff --git a/Code/Mantid/Framework/Algorithms/src/BinaryOperation.cpp b/Code/Mantid/Framework/Algorithms/src/BinaryOperation.cpp
@@ -22,7 +22,7 @@ namespace Mantid
   namespace Algorithms
   {
     BinaryOperation::BinaryOperation()
-      : API::PairedGroupAlgorithm(),
+      : API::Algorithm(),
       m_ClearRHSWorkspace(false),
       m_useHistogramForRhsEventWorkspace(false),
       m_do2D_even_for_SingleColumn_on_rhs(false),

diff --git a/Code/Mantid/Framework/Algorithms/src/ConjoinWorkspaces.cpp b/Code/Mantid/Framework/Algorithms/src/ConjoinWorkspaces.cpp
@@ -44,7 +44,7 @@ void ConjoinWorkspaces::initDocs()
 
 //----------------------------------------------------------------------------------------------
 /// Default constructor
-ConjoinWorkspaces::ConjoinWorkspaces() : PairedGroupAlgorithm(), m_progress(NULL) {}
+ConjoinWorkspaces::ConjoinWorkspaces() : Algorithm(), m_progress(NULL) {}
 
 //----------------------------------------------------------------------------------------------
 /// Destructor
@@ -457,7 +457,7 @@ void ConjoinWorkspaces::fixSpectrumNumbers(API::MatrixWorkspace_const_sptr ws1,
   output->generateSpectraMap();
 }
 
-/// Appends the removal of the empty group after execution to the PairedGroupAlgorithm::processGroups method
+/// Appends the removal of the empty group after execution to the Algorithm::processGroups() method
 bool ConjoinWorkspaces::processGroups()
 {
   // Call the base class method for most of the functionality