diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
index aa4115fec6d8368755871bcab4318c052af990a6..c4f56f3e3a8b2834127077d078d9b5affeaae399 100644
--- a/Code/Mantid/Framework/Algorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -159,7 +159,7 @@ set ( SRC_FILES
src/SANSDirectBeamScaling.cpp
src/Scale.cpp
src/ScaleX.cpp
- src/SetUncertaintiesToZero.cpp
+ src/SetUncertainties.cpp
src/ShiftLogTime.cpp
src/SignalOverError.cpp
src/SmoothData.cpp
@@ -352,7 +352,7 @@ set ( INC_FILES
inc/MantidAlgorithms/SANSDirectBeamScaling.h
inc/MantidAlgorithms/Scale.h
inc/MantidAlgorithms/ScaleX.h
- inc/MantidAlgorithms/SetUncertaintiesToZero.h
+ inc/MantidAlgorithms/SetUncertainties.h
inc/MantidAlgorithms/ShiftLogTime.h
inc/MantidAlgorithms/SignalOverError.h
inc/MantidAlgorithms/SmoothData.h
@@ -559,7 +559,7 @@ set(SRC_UNITY_IGNORE_FILES src/AlignDetectors.cpp
src/FFTSmooth.cpp
src/FFTSmooth2.cpp
src/FilterBadPulses.cpp
- src/SetUncertaintiesToZero.cpp
+ src/SetUncertainties.cpp
)
# Python unit tests
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SetUncertaintiesToZero.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SetUncertainties.h
similarity index 94%
rename from Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SetUncertaintiesToZero.h
rename to Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SetUncertainties.h
index 0f9d77a0d4f1581d7f3bd56e39631b4a8754f935..d4ea90eb913775a4172393587f7a4a12961c8b5d 100644
--- a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SetUncertaintiesToZero.h
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SetUncertainties.h
@@ -40,14 +40,14 @@ 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 SetUncertaintiesToZero : public API::Algorithm
+class DLLExport SetUncertainties : public API::Algorithm
{
public:
/// (Empty) Constructor
- SetUncertaintiesToZero();
+ SetUncertainties();
/// Virtual destructor
- virtual ~SetUncertaintiesToZero();
+ virtual ~SetUncertainties();
/// Algorithm's name
virtual const std::string name() const;
diff --git a/Code/Mantid/Framework/Algorithms/src/SetUncertaintiesToZero.cpp b/Code/Mantid/Framework/Algorithms/src/SetUncertainties.cpp
similarity index 85%
rename from Code/Mantid/Framework/Algorithms/src/SetUncertaintiesToZero.cpp
rename to Code/Mantid/Framework/Algorithms/src/SetUncertainties.cpp
index c9cc5e2d265713fb575c822a8d9012dbdd92a9dd..03e2417e76b61452dff01ec73a54a7a3de0f55bf 100644
--- a/Code/Mantid/Framework/Algorithms/src/SetUncertaintiesToZero.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/SetUncertainties.cpp
@@ -5,7 +5,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidAlgorithms/SetUncertaintiesToZero.h"
+#include "MantidAlgorithms/SetUncertainties.h"
#include "MantidKernel/ListValidator.h"
#include <vector>
@@ -15,10 +15,10 @@ namespace Algorithms
{
// Register the algorithm into the AlgorithmFactory
-DECLARE_ALGORITHM(SetUncertaintiesToZero)
+DECLARE_ALGORITHM(SetUncertainties)
/// Sets documentation strings for this algorithm
-void SetUncertaintiesToZero::initDocs()
+void SetUncertainties::initDocs()
{
this->setWikiSummary("This algorithm creates a workspace which is the duplicate of the input, but where the error value for every bin has been set to zero. ");
this->setOptionalMessage("This algorithm creates a workspace which is the duplicate of the input, but where the error value for every bin has been set to zero.");
@@ -29,25 +29,25 @@ using namespace Kernel;
using namespace API;
/// (Empty) Constructor
-SetUncertaintiesToZero::SetUncertaintiesToZero() : API::Algorithm()
+SetUncertainties::SetUncertainties() : API::Algorithm()
{}
/// Virtual destructor
-SetUncertaintiesToZero::~SetUncertaintiesToZero()
+SetUncertainties::~SetUncertainties()
{}
/// Algorithm's name
-const std::string SetUncertaintiesToZero::name() const
-{ return "SetUncertaintiesToZero";}
+const std::string SetUncertainties::name() const
+{ return "SetUncertainties";}
/// Algorithm's version
-int SetUncertaintiesToZero::version() const
+int SetUncertainties::version() const
{ return (1);}
const std::string ZERO("zero");
const std::string SQRT("sqrt");
-void SetUncertaintiesToZero::init()
+void SetUncertainties::init()
{
declareProperty(new WorkspaceProperty<API::MatrixWorkspace>("InputWorkspace","",
Direction::Input));
@@ -59,7 +59,7 @@ void SetUncertaintiesToZero::init()
declareProperty("SetError", ZERO, boost::make_shared<StringListValidator>(errorTypes), "How to reset the uncertainties");
}
-void SetUncertaintiesToZero::exec()
+void SetUncertainties::exec()
{
MatrixWorkspace_const_sptr inputWorkspace = getProperty("InputWorkspace");
std::string errorType = getProperty("SetError");
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py
index ec006df3e0cd530978ff748ac1eb132daf90361a..8ca0fd72d9205f03890b35dbbab30dd28613901d 100644
--- a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py
+++ b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py
@@ -597,7 +597,7 @@ class SNSPowderReduction(PythonAlgorithm):
MultipleScatteringCylinderAbsorption(InputWorkspace=vanRun, OutputWorkspace=vanRun, # numbers for vanadium
AttenuationXSection=2.8, ScatteringXSection=5.1,
SampleNumberDensity=0.0721, CylinderSampleRadius=.3175)
- SetUncertaintiesToZero(InputWorkspace=vanRun, OutputWorkspace=vanRun)
+ SetUncertainties(InputWorkspace=vanRun, OutputWorkspace=vanRun)
ConvertUnits(InputWorkspace=vanRun, OutputWorkspace=vanRun, Target="TOF")
workspacelist.append(str(vanRun))
else:
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction2.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction2.py
index aec1c7a6f3f332f31c0e64428d5e2a209e92644f..340d676b99bfae178e183ba1c091e515465aa845 100644
--- a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction2.py
+++ b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction2.py
@@ -667,7 +667,7 @@ class SNSPowderReduction2(PythonAlgorithm):
MultipleScatteringCylinderAbsorption(InputWorkspace=vanRun, OutputWorkspace=vanRun, # numbers for vanadium
AttenuationXSection=2.8, ScatteringXSection=5.1,
SampleNumberDensity=0.0721, CylinderSampleRadius=.3175)
- SetUncertaintiesToZero(InputWorkspace=vanRun, OutputWorkspace=vanRun)
+ SetUncertainties(InputWorkspace=vanRun, OutputWorkspace=vanRun)
if HAVE_MPI:
if mpi.world.rank > 0:
return