From 832bda77d6c149704355e2a951a2daf3ef461b51 Mon Sep 17 00:00:00 2001
From: Anthony Lim <anthony.lim@stfc.ac.uk>
Date: Thu, 14 Sep 2017 11:41:51 +0100
Subject: [PATCH] refs #20216 made apodization functions a namespace
---
.../Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h | 2 ++
Framework/Algorithms/src/ApodizationFunctions.cpp | 2 ++
Framework/Algorithms/src/PaddingAndApodization.cpp | 6 +++---
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h b/Framework/Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h
index 890eacac88b..4ed70ba322b 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ApodizationFunctions.h
@@ -36,10 +36,12 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
namespace Mantid {
namespace Algorithms {
+namespace ApodizationFunctions {
double lorentz(double time, double decayConstant);
double gaussian(const double time, const double decayConstant);
double none(const double, const double);
}
}
+}
#endif /*MANTID_APODIZATIONFUNCTIONS_H_*/
diff --git a/Framework/Algorithms/src/ApodizationFunctions.cpp b/Framework/Algorithms/src/ApodizationFunctions.cpp
index 9207a340981..f3641e71ea8 100644
--- a/Framework/Algorithms/src/ApodizationFunctions.cpp
+++ b/Framework/Algorithms/src/ApodizationFunctions.cpp
@@ -6,6 +6,7 @@
namespace Mantid {
namespace Algorithms {
+namespace ApodizationFunctions {
/**
* Returns the evaluation of the Lorentz
* (an exponential decay)
@@ -42,3 +43,4 @@ double gaussian(const double time, const double decayConstant) {
double none(const double, const double) { return 1.; }
}
}
+}
\ No newline at end of file
diff --git a/Framework/Algorithms/src/PaddingAndApodization.cpp b/Framework/Algorithms/src/PaddingAndApodization.cpp
index 90b8bca6997..f6e5086ab4e 100644
--- a/Framework/Algorithms/src/PaddingAndApodization.cpp
+++ b/Framework/Algorithms/src/PaddingAndApodization.cpp
@@ -134,11 +134,11 @@ typedef double (*fptr)(const double time, const double decayConstant);
*/
fptr PaddingAndApodization::getApodizationFunction(const std::string method) {
if (method == "None") {
- return none;
+ return ApodizationFunctions::none;
} else if (method == "Lorentz") {
- return lorentz;
+ return ApodizationFunctions::lorentz;
} else if (method == "Gaussian") {
- return gaussian;
+ return ApodizationFunctions::gaussian;
}
throw std::invalid_argument("The apodization function selected " + method +
" is not a valid option");
--
GitLab