Re #7083 Add functions of log value

mantidproject · Feb 20, 2015 · 734bd59 · 734bd59
1 parent fb4f697
commit 734bd59
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h
@@ -116,6 +116,8 @@ class DLLExport PlotAsymmetryByLogValue : public API::Algorithm {
   MantidVec m_diffX, m_diffY, m_diffE;
   // LogValue name
   std::string m_logName;
+  // LogValue function
+  std::string m_logFunc;
 };
 
 } // namespace Algorithm

diff --git a/Code/Mantid/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp b/Code/Mantid/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp
@@ -37,11 +37,21 @@ namespace // anonymous
  */
 template <typename T>
 bool convertLogToDouble(const Mantid::Kernel::Property *property,
-                        double &value) {
+                        double &value, const std::string& function) {
   const Mantid::Kernel::TimeSeriesProperty<T> *log =
       dynamic_cast<const Mantid::Kernel::TimeSeriesProperty<T> *>(property);
   if (log) {
-    value = static_cast<double>(log->lastValue());
+    if (function=="Mean") {
+      value = static_cast<double>(log->timeAverageValue());
+    } else if (function=="First") {
+      value = static_cast<double>(log->firstValue());
+    } else if (function=="Min") {
+      value = static_cast<double>(log->minValue());
+    } else if (function=="Max") {
+      value = static_cast<double>(log->maxValue());
+    } else { // Default
+      value = static_cast<double>(log->lastValue());
+    }
     return true;
   }
   auto tlog =
@@ -160,6 +170,8 @@ void PlotAsymmetryByLogValue::exec() {
   // Get runs
   std::string firstFN = getProperty("FirstRun");
   std::string lastFN = getProperty("LastRun");
+  // Get function to apply to logValue
+  m_logFunc = getProperty("Function");
 
   // Parse run names and get the number of runs
   std::string fnBase, fnExt;
@@ -630,24 +642,23 @@ double PlotAsymmetryByLogValue::getLogValue(MatrixWorkspace &ws) {
   if (!property) {
     throw std::invalid_argument("Log " + m_logName + " does not exist.");
   }
-
   double value = 0;
   // try different property types
-  if (convertLogToDouble<double>(property, value))
+  if (convertLogToDouble<double>(property, value, m_logFunc))
     return value;
-  if (convertLogToDouble<float>(property, value))
+  if (convertLogToDouble<float>(property, value, m_logFunc))
     return value;
-  if (convertLogToDouble<int>(property, value))
+  if (convertLogToDouble<int>(property, value, m_logFunc))
     return value;
-  if (convertLogToDouble<long>(property, value))
+  if (convertLogToDouble<long>(property, value, m_logFunc))
     return value;
-  if (convertLogToDouble<long long>(property, value))
+  if (convertLogToDouble<long long>(property, value, m_logFunc))
     return value;
-  if (convertLogToDouble<unsigned int>(property, value))
+  if (convertLogToDouble<unsigned int>(property, value, m_logFunc))
     return value;
-  if (convertLogToDouble<unsigned long>(property, value))
+  if (convertLogToDouble<unsigned long>(property, value, m_logFunc))
     return value;
-  if (convertLogToDouble<unsigned long long>(property, value))
+  if (convertLogToDouble<unsigned long long>(property, value, m_logFunc))
     return value;
   // try if it's a string and can be lexically cast to double
   auto slog =