Change a few categories. Refs #4289

mantidproject · Dec 28, 2011 · 01f04fe · 01f04fe
1 parent 4934afb
commit 01f04fe
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 23 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CloneWorkspace.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CloneWorkspace.h
@@ -54,7 +54,7 @@ class DLLExport CloneWorkspace : public API::Algorithm
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "General"; }
+  virtual const std::string category() const { return "Utility\\Workspaces"; }
 
 private:
   /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CopySample.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CopySample.h
@@ -54,7 +54,7 @@ namespace Algorithms
     /// Algorithm's version for identification 
     virtual int version() const { return 1;};
     /// Algorithm's category for identification
-    virtual const std::string category() const { return "General";}
+    virtual const std::string category() const { return "Sample;Utility\\Workspaces;DataHandling";}
 
   private:
     /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateGroupingWorkspace.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateGroupingWorkspace.h
@@ -30,7 +30,7 @@ namespace Algorithms
     /// Algorithm's version for identification 
     virtual int version() const { return 1;};
     /// Algorithm's category for identification
-    virtual const std::string category() const { return "General";}
+    virtual const std::string category() const { return "Utility\\Workspaces;Transforms\\Grouping";}
 
   private:
     /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreatePeaksWorkspace.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreatePeaksWorkspace.h
@@ -25,7 +25,7 @@ namespace Algorithms
     /// Algorithm's version for identification 
     virtual int version() const { return 1;};
     /// Algorithm's category for identification
-    virtual const std::string category() const { return "Crystal";}
+    virtual const std::string category() const { return "Crystal;Utility\\Workspaces";}
 
   private:
     /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h
@@ -61,7 +61,7 @@ class DLLExport CrossCorrelate : public API::Algorithm
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Utility"; }
+  virtual const std::string category() const { return "Utility;Arithmetic"; }
 
 private:
   /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/DampSq.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/DampSq.h
@@ -25,7 +25,7 @@ namespace Algorithms
     /// Algorithm's version for identification 
     virtual int version() const { return 1;};
     /// Algorithm's category for identification
-    virtual const std::string category() const { return "General";}
+    virtual const std::string category() const { return "Diffraction";}
 
   private:
     /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ElasticWindow.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ElasticWindow.h
@@ -48,7 +48,7 @@ class DLLExport ElasticWindow : public API::Algorithm
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "General;Inelastic"; }
+  virtual const std::string category() const { return "Inelastic"; }
 
 private:
   /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ExponentialCorrection.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ExponentialCorrection.h
@@ -58,7 +58,7 @@ namespace Mantid
       /// Algorithm's version for identification
       virtual int version() const { return 1;}
       /// Algorithm's category for identification overriding a virtual method
-      virtual const std::string category() const{ return "CorrectionFunctions"; }
+      virtual const std::string category() const{ return "CorrectionFunctions;Arithmetic"; }
 
     private:
       /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GeneralisedSecondDifference.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GeneralisedSecondDifference.h
@@ -59,7 +59,7 @@ class DLLExport GeneralisedSecondDifference : public API::Algorithm
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "General"; }
+  virtual const std::string category() const { return "Arithmetic"; }
 
 private:
   /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h
@@ -53,7 +53,7 @@ class DLLExport GeneratePythonScript : public API::Algorithm
   /// Algorithm's version for identification
   virtual int version() const { return 1;};
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "General";}
+  virtual const std::string category() const { return "Utility;PythonAlgorithms";}
 
 private:
   /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GetEi.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GetEi.h
@@ -56,7 +56,7 @@ class DLLExport GetEi : public API::Algorithm
   /// Algorithm's version for identification overriding a virtual method
   virtual int version() const { return 1; }
   /// Algorithm's category for identification overriding a virtual method
-  virtual const std::string category() const{return "Inelastic;CorrectionFunctions";}
+  virtual const std::string category() const{return "Inelastic";}
 
 private:
   /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GetEi2.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GetEi2.h
@@ -62,7 +62,7 @@ namespace Algorithms
       /// Algorithm's version for identification overriding a virtual method
       virtual int version() const { return 2; }
       /// Algorithm's category for identification overriding a virtual method
-      virtual const std::string category() const{return "Inelastic;CorrectionFunctions";}
+      virtual const std::string category() const{return "Inelastic";}
 
     private:
       /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/IDLRebin.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/IDLRebin.h
@@ -6,7 +6,7 @@ TODO: Enter wiki description here.
 
 #include "MantidKernel/System.h"
 #include "MantidAPI/Algorithm.h"
-
+#include "MantidAPI/DeprecatedAlgorithm.h"
 
 namespace Mantid
 {
@@ -38,7 +38,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 IDLRebin : public API::Algorithm
+  class DLLExport IDLRebin : public API::Algorithm, public API::DeprecatedAlgorithm
   {
   public:
     IDLRebin();

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/IdentifyNoisyDetectors.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/IdentifyNoisyDetectors.h
@@ -41,7 +41,7 @@ class DLLExport IdentifyNoisyDetectors : public API::Algorithm
     virtual ~IdentifyNoisyDetectors() {} ///< Empty destructor
 
     virtual const std::string name() const { return "IdentifyNoisyDetectors"; } ///< @return the algorithms name
-    virtual const std::string category() const { return "General"; } ///< @return the algorithms category
+    virtual const std::string category() const { return "Diagnostics"; } ///< @return the algorithms category
     virtual int version() const { return (1); } ///< @return version number of algorithm
 
   private:

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/UnaryOperation.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/UnaryOperation.h
@@ -54,7 +54,7 @@ namespace Mantid
       virtual ~UnaryOperation();
 
       /// Algorithm's category for identification
-      virtual const std::string category() const { return "CorrectionFunctions";}
+      virtual const std::string category() const { return "CorrectionFunctions;Arithmetic";}
 
     protected:
       // Overridden Algorithm methods

diff --git a/Code/Mantid/Framework/Algorithms/test/CloneWorkspaceTest.h b/Code/Mantid/Framework/Algorithms/test/CloneWorkspaceTest.h
@@ -37,7 +37,7 @@ class CloneWorkspaceTest : public CxxTest::TestSuite
 
   void testCategory()
   {
-    TS_ASSERT_EQUALS( cloner.category(), "General" );
+    TS_ASSERT_EQUALS( cloner.category(), "Utility\\Workspaces" );
   }
 
   void testInit()

diff --git a/Code/Mantid/Framework/Algorithms/test/ExponentialCorrectionTest.h b/Code/Mantid/Framework/Algorithms/test/ExponentialCorrectionTest.h
@@ -26,7 +26,7 @@ class ExponentialCorrectionTest : public CxxTest::TestSuite
 
   void testCategory()
   {
-    TS_ASSERT_EQUALS( expon.category(), "CorrectionFunctions" )
+    TS_ASSERT_EQUALS( expon.category(), "CorrectionFunctions;Arithmetic" )
   }
 
   void testInit()

diff --git a/Code/Mantid/Framework/Algorithms/test/IdentifyNoisyDetectorsTest.h b/Code/Mantid/Framework/Algorithms/test/IdentifyNoisyDetectorsTest.h
@@ -17,7 +17,7 @@ class IdentifyNoisyDetectorsTest : public CxxTest::TestSuite
     alg = new IdentifyNoisyDetectors();
     TS_ASSERT_EQUALS(alg->name(), "IdentifyNoisyDetectors");
     TS_ASSERT_EQUALS(alg->version(), 1);
-    TS_ASSERT_EQUALS(alg->category(), "General");
+    TS_ASSERT_EQUALS(alg->category(), "Diagnostics");
     delete alg;
   }
 

diff --git a/Code/Mantid/Framework/Algorithms/test/UnaryOperationTest.h b/Code/Mantid/Framework/Algorithms/test/UnaryOperationTest.h
@@ -34,7 +34,7 @@ class UnaryOperationTest : public CxxTest::TestSuite
 public:
   void testCategory()
   {
-    TS_ASSERT_EQUALS( helper.category(), "CorrectionFunctions" )
+    TS_ASSERT_EQUALS( helper.category(), "CorrectionFunctions;Arithmetic" )
   }
 
   void testInputPropName()

diff --git a/Code/Mantid/Framework/Crystal/inc/MantidCrystal/FindSXPeaks.h b/Code/Mantid/Framework/Crystal/inc/MantidCrystal/FindSXPeaks.h
@@ -208,7 +208,7 @@ class DLLExport FindSXPeaks : public API::Algorithm
   /// Algorithm's version for identification overriding a virtual method
   virtual int version() const { return (1);}
   /// Algorithm's category for identification overriding a virtual method
-  virtual const std::string category() const { return "Crystal";}
+  virtual const std::string category() const { return "Crystal;Optimization\\FindPeaks";}
 
 private:
   void initDocs();

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h
@@ -50,7 +50,7 @@ class DLLExport CreateSampleShape : public Mantid::API::Algorithm
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Sample"; }
+  virtual const std::string category() const { return "Sample;DataHandling"; }
 
 private:
   /// Sets documentation strings for this algorithm

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/FindPeaksMD.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/FindPeaksMD.h
@@ -33,7 +33,7 @@ namespace MDEvents
     /// Algorithm's version for identification 
     virtual int version() const { return 1;};
     /// Algorithm's category for identification
-    virtual const std::string category() const { return "General";}
+    virtual const std::string category() const { return "Optimization\\FindPeaks;MDAlgorithms";}
 
   private:
     /// Sets documentation strings for this algorithm