Skip to content

Commit

Permalink
Refs #9447. Removed unused property PeakHeightTolerance.
Browse files Browse the repository at this point in the history
And the variables related to this property.
  • Loading branch information
wdzhou committed May 29, 2014
1 parent e62cea5 commit 6500215
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
Expand Up @@ -174,7 +174,6 @@ class DLLExport FindPeaks : public API::Algorithm
bool m_highBackground; ///<flag for find relatively weak peak in high background
bool m_rawPeaksTable; ///<flag for whether the output is the raw peak parameters or effective (centre, width, height)
std::size_t m_numTableParams; //<Number of parameters in the output table workspace
// bool m_searchPeakPos; ///<flag to search for peak in the window
std::string m_peakFuncType; //< The name of the peak function to fit
std::string m_backgroundType; //< The type of background to fit

Expand All @@ -193,9 +192,6 @@ class DLLExport FindPeaks : public API::Algorithm
bool m_usePeakPositionTolerance;
double m_peakPositionTolerance;

bool m_usePeakHeightTolerance;
double m_peakHeightTolerance;

std::vector<API::IFunction_sptr> m_fitFunctions;
std::vector<size_t> m_peakLeftIndexes;
std::vector<size_t> m_peakRightIndexes;
Expand Down
9 changes: 0 additions & 9 deletions Code/Mantid/Framework/Algorithms/src/FindPeaks.cpp
Expand Up @@ -153,9 +153,6 @@ namespace Algorithms
declareProperty("PeakPositionTolerance", EMPTY_DBL(), mustBePositiveDBL,
"Tolerance on the found peaks' positions against the input peak positions. Non-positive value indicates that this option is turned off.");

declareProperty("PeakHeightTolerance", EMPTY_DBL(),
"Tolerance of the ratio on the found peak's height against the local maximum. Non-positive value turns this option off. ");

// The found peaks in a table
declareProperty(new WorkspaceProperty<API::ITableWorkspace>("PeaksList", "", Direction::Output),
"The name of the TableWorkspace in which to store the list of peaks found");
Expand Down Expand Up @@ -218,7 +215,6 @@ namespace Algorithms
{
//Use Mariscotti's method to find the peak centers
m_usePeakPositionTolerance = false;
m_usePeakHeightTolerance = false;
this->findPeaksUsingMariscotti();
}

Expand Down Expand Up @@ -273,11 +269,6 @@ namespace Algorithms
if (isEmpty(m_peakPositionTolerance))
m_usePeakPositionTolerance = false;

m_peakHeightTolerance = getProperty("PeakHeightTolerance");
m_usePeakHeightTolerance = true;
if (isEmpty(m_peakHeightTolerance))
m_usePeakHeightTolerance = false;

// Specified peak positions, which is optional
m_vecPeakCentre = getProperty("PeakPositions");
if (m_vecPeakCentre.size() > 0)
Expand Down

0 comments on commit 6500215

Please sign in to comment.