From 1fdd13711b53f5e680bb1b1fe1c583fcb496dc2e Mon Sep 17 00:00:00 2001
From: Nick Draper <nick.draper@stfc.ac.uk>
Date: Tue, 3 Nov 2015 17:19:35 +0000
Subject: [PATCH] Utility and workflow cleaned
re #8840
---
Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h | 2 +-
Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h | 2 +-
Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h | 2 +-
Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h | 2 +-
.../Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h | 2 +-
.../Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h | 2 +-
Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h | 2 +-
.../Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h | 2 +-
Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h | 2 +-
Framework/Algorithms/src/ClearMaskFlag.cpp | 2 +-
Framework/Algorithms/src/Comment.cpp | 2 +-
Framework/Algorithms/src/RemoveWorkspaceHistory.cpp | 2 +-
Framework/Algorithms/src/ResetNegatives.cpp | 2 +-
Framework/Algorithms/src/UpdateScriptRepository.cpp | 2 +-
Framework/Crystal/inc/MantidCrystal/SortHKL.h | 2 +-
Framework/Crystal/src/SortPeaksWorkspace.cpp | 2 +-
.../DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h | 2 +-
Framework/DataHandling/src/SortTableWorkspace.cpp | 2 +-
.../plugins/algorithms/ExportSampleLogsToCSVFile.py | 2 +-
Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py | 2 +-
.../PythonInterface/plugins/algorithms/SavePlot1DAsJson.py | 2 +-
Framework/PythonInterface/plugins/algorithms/SortByQVectors.py | 2 +-
Framework/PythonInterface/plugins/algorithms/SortDetectors.py | 2 +-
Framework/PythonInterface/plugins/algorithms/SortXAxis.py | 2 +-
.../plugins/algorithms/StatisticsOfTableWorkspace.py | 2 +-
.../plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py | 2 +-
Framework/WorkflowAlgorithms/src/SendUsage.cpp | 2 +-
27 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h
index df88cbf1bc1..1ad6ae3a209 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h
@@ -46,7 +46,7 @@ public:
virtual int version() const { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Utility"; }
+ virtual const std::string category() const { return "Utility\\Calculation"; }
private:
/// Implement abstract Algorithm methods
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h b/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
index c20dd17461a..1bd283f85e1 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
@@ -28,7 +28,7 @@ public:
/// Algorithm's version for identification
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\\Workspaces"; }
private:
/// Initialise the properties
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h b/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h
index b838209bd50..eb60ad91ab5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h
@@ -77,7 +77,7 @@ public:
/// Algorithm's version
virtual int version() const { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility;Arithmetic"; }
+ virtual const std::string category() const { return "Arithmetic"; }
private:
/// Initialisation code
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h b/Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h
index 25443414ec0..e29dd69b107 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h
@@ -46,7 +46,7 @@ public:
virtual int version() const { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Utility"; }
+ virtual const std::string category() const { return "Utility\\Calculation"; }
private:
std::string m_backgroundType; //< The type of background to fit
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h b/Framework/Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h
index 126afef6d20..fa720c80153 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h
@@ -55,7 +55,7 @@ public:
/// Algorithm's version for identification
virtual int version() const { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Development"; }
+ virtual const std::string category() const { return "Utility\\Python"; }
protected:
/// Initialise the properties
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h b/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h
index 23df6bb7a6d..923a9874432 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h
@@ -58,7 +58,7 @@ public:
/// Algorithm's version for identification
virtual int version() const { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Development"; }
+ virtual const std::string category() const { return "Utility\\Python"; }
protected:
/// Initialise the properties
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h b/Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h
index aaccb88f198..59e9c3ffaaa 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h
@@ -58,7 +58,7 @@ public:
virtual int version() const { return 1; };
/// Algorithm's category for identification
virtual const std::string category() const {
- return "Utility";
+ return "Utility\\Python";
}
private:
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h b/Framework/Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h
index 52b5618c38d..230b841e913 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h
@@ -71,7 +71,7 @@ public:
virtual int version() const { return 1; }
/// Algorithm's category for identification
virtual const std::string category() const {
- return "Utility;CorrectionFunctions\\SpecialCorrections";
+ return "CorrectionFunctions\\SpecialCorrections";
}
private:
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h b/Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h
index dbb110decd1..17a37c84d29 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h
@@ -58,7 +58,7 @@ public:
/// 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 "Events"; }
+ virtual const std::string category() const { return "Events;Utility\\Sorting"; }
protected:
// Overridden Algorithm methods
diff --git a/Framework/Algorithms/src/ClearMaskFlag.cpp b/Framework/Algorithms/src/ClearMaskFlag.cpp
index ba16cd12b7f..030859d0438 100644
--- a/Framework/Algorithms/src/ClearMaskFlag.cpp
+++ b/Framework/Algorithms/src/ClearMaskFlag.cpp
@@ -27,7 +27,7 @@ const std::string ClearMaskFlag::name() const { return "ClearMaskFlag"; }
int ClearMaskFlag::version() const { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
-const std::string ClearMaskFlag::category() const { return "Utility"; }
+const std::string ClearMaskFlag::category() const { return "Transforms\\Masking"; }
//----------------------------------------------------------------------------------------------
/** Initialize the algorithm's properties.
diff --git a/Framework/Algorithms/src/Comment.cpp b/Framework/Algorithms/src/Comment.cpp
index 85e41a1ef5a..277fdeeabcc 100644
--- a/Framework/Algorithms/src/Comment.cpp
+++ b/Framework/Algorithms/src/Comment.cpp
@@ -31,7 +31,7 @@ const std::string Comment::name() const { return "Comment"; }
int Comment::version() const { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
-const std::string Comment::category() const { return "Utility"; }
+const std::string Comment::category() const { return "Utility\\Workspaces"; }
/// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
const std::string Comment::summary() const {
diff --git a/Framework/Algorithms/src/RemoveWorkspaceHistory.cpp b/Framework/Algorithms/src/RemoveWorkspaceHistory.cpp
index 4d6ecc74b7c..d1805e8a63d 100644
--- a/Framework/Algorithms/src/RemoveWorkspaceHistory.cpp
+++ b/Framework/Algorithms/src/RemoveWorkspaceHistory.cpp
@@ -30,7 +30,7 @@ const std::string RemoveWorkspaceHistory::name() const {
int RemoveWorkspaceHistory::version() const { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
-const std::string RemoveWorkspaceHistory::category() const { return "Utility"; }
+const std::string RemoveWorkspaceHistory::category() const { return "Utility\\Workspaces"; }
/// Algorithm's summary for identification. @see Algorithm::summary
const std::string RemoveWorkspaceHistory::summary() const {
diff --git a/Framework/Algorithms/src/ResetNegatives.cpp b/Framework/Algorithms/src/ResetNegatives.cpp
index 695b8237766..d960470c1f3 100644
--- a/Framework/Algorithms/src/ResetNegatives.cpp
+++ b/Framework/Algorithms/src/ResetNegatives.cpp
@@ -29,7 +29,7 @@ const std::string ResetNegatives::name() const { return "ResetNegatives"; }
int ResetNegatives::version() const { return 1; }
/// @copydoc Mantid::API::IAlgorithm::category()
-const std::string ResetNegatives::category() const { return "Utility"; }
+const std::string ResetNegatives::category() const { return "CorrectionFunctions\\SpecialCorrections"; }
//----------------------------------------------------------------------------------------------
/// @copydoc Mantid::API::Algorithm::init()
diff --git a/Framework/Algorithms/src/UpdateScriptRepository.cpp b/Framework/Algorithms/src/UpdateScriptRepository.cpp
index 45e620542ce..4143a6e9065 100644
--- a/Framework/Algorithms/src/UpdateScriptRepository.cpp
+++ b/Framework/Algorithms/src/UpdateScriptRepository.cpp
@@ -28,7 +28,7 @@ const std::string UpdateScriptRepository::name() const {
int UpdateScriptRepository::version() const { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
-const std::string UpdateScriptRepository::category() const { return "Utility"; }
+const std::string UpdateScriptRepository::category() const { return "Utility\\Python"; }
//----------------------------------------------------------------------------------------------
diff --git a/Framework/Crystal/inc/MantidCrystal/SortHKL.h b/Framework/Crystal/inc/MantidCrystal/SortHKL.h
index 7b7f1cac1a2..ce4362c8c0f 100644
--- a/Framework/Crystal/inc/MantidCrystal/SortHKL.h
+++ b/Framework/Crystal/inc/MantidCrystal/SortHKL.h
@@ -32,7 +32,7 @@ public:
virtual int version() const { return 1; };
/// Algorithm's category for identification
virtual const std::string category() const {
- return "Crystal\\Peaks;DataHandling\\Text";
+ return "Crystal\\Peaks;DataHandling\\Text;Utility\\Sorting";
}
private:
diff --git a/Framework/Crystal/src/SortPeaksWorkspace.cpp b/Framework/Crystal/src/SortPeaksWorkspace.cpp
index a6c3d78d503..e42ddd7b338 100644
--- a/Framework/Crystal/src/SortPeaksWorkspace.cpp
+++ b/Framework/Crystal/src/SortPeaksWorkspace.cpp
@@ -31,7 +31,7 @@ const std::string SortPeaksWorkspace::name() const {
int SortPeaksWorkspace::version() const { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
-const std::string SortPeaksWorkspace::category() const { return "Crystal\\Peaks"; }
+const std::string SortPeaksWorkspace::category() const { return "Crystal\\Peaks;Utility\\Sorting"; }
//----------------------------------------------------------------------------------------------
diff --git a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
index 1c7c33b13f0..5e5bf5684e4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
@@ -71,7 +71,7 @@ public:
/// 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 "Utility"; }
+ virtual const std::string category() const { return "Utility\\Instrument"; }
private:
// Implement abstract Algorithm methods
diff --git a/Framework/DataHandling/src/SortTableWorkspace.cpp b/Framework/DataHandling/src/SortTableWorkspace.cpp
index cb9119ca6ec..b8b5cd62d6c 100644
--- a/Framework/DataHandling/src/SortTableWorkspace.cpp
+++ b/Framework/DataHandling/src/SortTableWorkspace.cpp
@@ -27,7 +27,7 @@ SortTableWorkspace::~SortTableWorkspace() {}
int SortTableWorkspace::version() const { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
-const std::string SortTableWorkspace::category() const { return "Utility"; }
+const std::string SortTableWorkspace::category() const { return "Utility\\Sorting"; }
/// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
const std::string SortTableWorkspace::summary() const {
diff --git a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
index cba8c10f0c4..7d6d8de9022 100644
--- a/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
+++ b/Framework/PythonInterface/plugins/algorithms/ExportSampleLogsToCSVFile.py
@@ -24,7 +24,7 @@ class ExportSampleLogsToCSVFile(PythonAlgorithm):
def category(self):
""" Category
"""
- return "Utility"
+ return "DataHandling\\Logs"
def name(self):
""" Algorithm name
diff --git a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
index 4acaafd30e3..cf8a3e34f4e 100644
--- a/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
+++ b/Framework/PythonInterface/plugins/algorithms/RetrieveRunInfo.py
@@ -177,7 +177,7 @@ class FileBackedWsIterator(object):
class RetrieveRunInfo(PythonAlgorithm):
def category(self):
- return 'Utility'
+ return 'DataHandling\\Catalog'
def summary(self):
return "Given a range of run numbers and an output workspace name, will compile a table of info for "+\
diff --git a/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py b/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
index 7bc6cc43370..66c1c7e330e 100644
--- a/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
+++ b/Framework/PythonInterface/plugins/algorithms/SavePlot1DAsJson.py
@@ -11,7 +11,7 @@ class SavePlot1DAsJson(PythonAlgorithm):
def category(self):
"""
"""
- return "Utility"
+ return "DataHandling\\Plots"
def name(self):
"""
diff --git a/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py b/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
index 8dc7728057a..d55f6ed5cb8 100644
--- a/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
+++ b/Framework/PythonInterface/plugins/algorithms/SortByQVectors.py
@@ -11,7 +11,7 @@ class SortByQVectors(PythonAlgorithm):
"""
def category(self):
- return "Transforms\\Merging"
+ return "Transforms\\Merging;Utility\\Sorting"
def name(self):
return "SortByQVectors"
diff --git a/Framework/PythonInterface/plugins/algorithms/SortDetectors.py b/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
index 5d92140055e..6a174458523 100644
--- a/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
+++ b/Framework/PythonInterface/plugins/algorithms/SortDetectors.py
@@ -10,7 +10,7 @@ class SortDetectors(PythonAlgorithm):
def category(self):
""" Return category
"""
- return "Utility"
+ return "Utility\\Sorting"
def name(self):
""" Return name
diff --git a/Framework/PythonInterface/plugins/algorithms/SortXAxis.py b/Framework/PythonInterface/plugins/algorithms/SortXAxis.py
index a839e7a3783..13483e87997 100644
--- a/Framework/PythonInterface/plugins/algorithms/SortXAxis.py
+++ b/Framework/PythonInterface/plugins/algorithms/SortXAxis.py
@@ -8,7 +8,7 @@ import numpy as np
class SortXAxis(PythonAlgorithm):
def category(self):
- return "Transforms\\Axes"
+ return "Transforms\\Axes;Utility\\Sorting"
def name(self):
diff --git a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
index bc4591b6ae3..829e4a4d07b 100644
--- a/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
+++ b/Framework/PythonInterface/plugins/algorithms/StatisticsOfTableWorkspace.py
@@ -25,7 +25,7 @@ def _stats_to_dict(stats):
class StatisticsOfTableWorkspace(PythonAlgorithm):
def category(self):
- return 'Utility'
+ return 'Utility\\Workspaces'
def summary(self):
diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
index b29f7cea0b9..c8974dcf3d1 100644
--- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
+++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SavePlot1D.py
@@ -8,7 +8,7 @@ class SavePlot1D(mantid.api.PythonAlgorithm):
def category(self):
""" Category
"""
- return "Utility"
+ return "DataHandling\\Plots"
def name(self):
""" Algorithm name
diff --git a/Framework/WorkflowAlgorithms/src/SendUsage.cpp b/Framework/WorkflowAlgorithms/src/SendUsage.cpp
index c8c2e87b644..3e0426e53bb 100644
--- a/Framework/WorkflowAlgorithms/src/SendUsage.cpp
+++ b/Framework/WorkflowAlgorithms/src/SendUsage.cpp
@@ -76,7 +76,7 @@ const std::string SendUsage::name() const { return "SendUsage"; }
int SendUsage::version() const { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
-const std::string SendUsage::category() const { return "Workflow"; }
+const std::string SendUsage::category() const { return "Workflow\\Reporting"; }
/// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
const std::string SendUsage::summary() const {
--
GitLab