From c76bfce25c4659d573da5c988c0087e1f63ca1d9 Mon Sep 17 00:00:00 2001 From: Jose Borreguero Date: Wed, 5 Mar 2014 11:32:07 -0500 Subject: [PATCH] Refs #9134 Changed category names --- .../inc/MantidCurveFitting/DiffRotDiscreteCircle.h | 6 +++--- .../CurveFitting/inc/MantidCurveFitting/DiffSphere.h | 6 +++--- .../PythonInterface/plugins/functions/StretchedExpFT.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffRotDiscreteCircle.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffRotDiscreteCircle.h index 66f16955ad6d..fac307d992c3 100644 --- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffRotDiscreteCircle.h +++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffRotDiscreteCircle.h @@ -53,7 +53,7 @@ class DLLExport ElasticDiffRotDiscreteCircle : public DeltaFunction /// overwrite IFunction base class methods virtual std::string name()const{ return "ElasticDiffRotDiscreteCircle"; } - virtual const std::string category() const { return "QENS"; } + virtual const std::string category() const { return "QuasiElastic"; } /// overwrite IFunction base class method, which declare function parameters virtual void init(); @@ -79,7 +79,7 @@ class DLLExport InelasticDiffRotDiscreteCircle : public API::ParamFunction, publ virtual std::string name() const { return "InelasticDiffRotDiscreteCircle"; } - virtual const std::string category() const { return "QENS"; } + virtual const std::string category() const { return "QuasiElastic"; } virtual void init(); @@ -107,7 +107,7 @@ class DLLExport DiffRotDiscreteCircle : public API::ImmutableCompositeFunction virtual std::string name() const { return "DiffRotDiscreteCircle"; } - virtual const std::string category() const { return "QENS"; } + virtual const std::string category() const { return "QuasiElastic"; } virtual int version() const { return 1; } diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h index 938002944280..f3eefa354ce0 100644 --- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h +++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DiffSphere.h @@ -54,7 +54,7 @@ class DLLExport ElasticDiffSphere : public DeltaFunction /// overwrite IFunction base class methods virtual std::string name() const { return "ElasticDiffSphere"; } - virtual const std::string category() const { return "QENS"; } + virtual const std::string category() const { return "QuasiElastic"; } /// A rescaling of the peak intensity double HeightPrefactor() const; @@ -95,7 +95,7 @@ class DLLExport InelasticDiffSphere : public API::ParamFunction, public API::IFu virtual std::string name()const{return "InelasticDiffSphere"; } /// overwrite IFunction base class methods - virtual const std::string category() const { return "QENS"; } + virtual const std::string category() const { return "QuasiElastic"; } /// Calculate the (2l+1)*A_{n,l} coefficients for each Lorentzian std::vector< double > LorentzianCoefficients( double a ) const; @@ -148,7 +148,7 @@ class DLLExport DiffSphere : public API::ImmutableCompositeFunction std::string name()const{ return "DiffSphere"; } /// overwrite IFunction base class methods - virtual const std::string category() const { return "QENS"; } + virtual const std::string category() const { return "QuasiElastic"; } /// overwrite IFunction base class methods virtual int version() const { return 1; } diff --git a/Code/Mantid/Framework/PythonInterface/plugins/functions/StretchedExpFT.py b/Code/Mantid/Framework/PythonInterface/plugins/functions/StretchedExpFT.py index d8a9d7cda272..76b51198bc3a 100644 --- a/Code/Mantid/Framework/PythonInterface/plugins/functions/StretchedExpFT.py +++ b/Code/Mantid/Framework/PythonInterface/plugins/functions/StretchedExpFT.py @@ -48,7 +48,7 @@ def __init__(self): self._parm2index = {'height':0,'tau':1,'beta':2} #order in which they were defined def category(self): - return 'QENS' + return 'QuasiElastic' def init(self): '''Declare parameters that participate in the fitting'''