Skip to content

Commit

Permalink
Refs #9134 Changed category names
Browse files Browse the repository at this point in the history
  • Loading branch information
jmborr committed Mar 5, 2014
1 parent 896078e commit c76bfce
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Expand Up @@ -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();
Expand All @@ -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();

Expand Down Expand Up @@ -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; }

Expand Down
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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; }
Expand Down
Expand Up @@ -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'''
Expand Down

2 comments on commit c76bfce

@stuartcampbell
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be either Quasielastic or Quasi-elastic ?

@jmborr
Copy link
Member Author

@jmborr jmborr commented on c76bfce Mar 5, 2014 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.