diff --git a/Framework/DataObjects/inc/MantidDataObjects/Peak.h b/Framework/DataObjects/inc/MantidDataObjects/Peak.h index f36f4154ba5288b587d2de771b34eea5ece80a0b..27a195983234b7fa0b5e64e6d0f80968b83df632 100644 --- a/Framework/DataObjects/inc/MantidDataObjects/Peak.h +++ b/Framework/DataObjects/inc/MantidDataObjects/Peak.h @@ -126,11 +126,13 @@ public: double getInitialEnergy() const override; double getFinalEnergy() const override; + double getEnergy() const override; void setInitialEnergy(double m_initialEnergy) override; void setFinalEnergy(double m_finalEnergy) override; double getIntensity() const override; double getSigmaIntensity() const override; + double getIntensityOverSigma() const override; void setIntensity(double m_intensity) override; void setSigmaIntensity(double m_sigmaIntensity) override; diff --git a/Framework/DataObjects/src/Peak.cpp b/Framework/DataObjects/src/Peak.cpp index 169ee3c15a1b2ec8ce2814e04ca200594ee600e0..569860359118e74eca4e768a8e4cfb41ddf65388 100644 --- a/Framework/DataObjects/src/Peak.cpp +++ b/Framework/DataObjects/src/Peak.cpp @@ -713,6 +713,12 @@ double Peak::getFinalEnergy() const { return m_finalEnergy; } /** Get the initial (incident) neutron energy */ double Peak::getInitialEnergy() const { return m_initialEnergy; } +/** Get the difference between the initial and final neutron energy */ +double Peak::getEnergy() const +{ + return getInitialEnergy() - getFinalEnergy(); +} + //---------------------------------------------------------------------------------------------- /** Get the H index of the peak */ double Peak::getH() const { return m_H; } @@ -791,6 +797,12 @@ double Peak::getIntensity() const { return m_intensity; } /** Return the error on the integrated peak intensity */ double Peak::getSigmaIntensity() const { return m_sigmaIntensity; } +/** Return the peak intensity divided by the error in the intensity */ +double Peak::getIntensityOverSigma() const +{ + return m_intensity / m_sigmaIntensity; +} + /** Set the integrated peak intensity * @param m_intensity :: intensity value */ void Peak::setIntensity(double m_intensity) { this->m_intensity = m_intensity; } diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h b/Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h index 7703dd2dc0ff166c4eb6aef6178380f304480a9d..9dc284e6a66bd97befc2b8fecf1b2543bd67aeeb 100644 --- a/Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h +++ b/Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h @@ -63,12 +63,13 @@ public: virtual double getInitialEnergy() const = 0; virtual double getFinalEnergy() const = 0; + virtual double getEnergy() const = 0; virtual void setInitialEnergy(double m_InitialEnergy) = 0; virtual void setFinalEnergy(double m_FinalEnergy) = 0; virtual double getIntensity() const = 0; virtual double getSigmaIntensity() const = 0; - + virtual double getIntensityOverSigma() const = 0; virtual void setIntensity(double m_Intensity) = 0; virtual void setSigmaIntensity(double m_SigmaIntensity) = 0;