Re #6267. Minimum and maximum value can be the same.

mantidproject · Dec 7, 2012 · fa22af8 · fa22af8
1 parent c965041
commit fa22af8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/FilterByLogValue.cpp b/Code/Mantid/Framework/Algorithms/src/FilterByLogValue.cpp
@@ -35,20 +35,12 @@ times of the pulses to be rejected. For example, this call will filter out veto
 
 *WIKI*/
 
+//----------------------------------------------------------------------
+// Includes
+//----------------------------------------------------------------------
 #include "MantidAlgorithms/FilterByLogValue.h"
-#include "MantidDataObjects/EventList.h"
-#include "MantidDataObjects/EventWorkspace.h"
-#include "MantidAPI/WorkspaceValidators.h"
-#include "MantidAPI/SpectraDetectorMap.h"
-#include "MantidKernel/UnitFactory.h"
-#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidKernel/PhysicalConstants.h"
-#include "MantidKernel/DateAndTime.h"
-#include "MantidAPI/FileProperty.h"
-
-#include <fstream>
-#include "MantidKernel/TimeSplitter.h"
 #include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/ITimeSeriesProperty.h"
 #include "MantidKernel/ListValidator.h"
 
 namespace Mantid
@@ -186,8 +178,8 @@ void FilterByLogValue::exec()
     else
     {
       // ----- Filter by value ------
-      if (max <= min)
-        throw std::invalid_argument("MaximumValue should be > MinimumValue. Aborting.");
+      if (max < min)
+        throw std::invalid_argument("MaximumValue should be >= MinimumValue. Aborting.");
 
       //This function creates the splitter vector we will use to filter out stuff.
       const std::string logBoundary(this->getPropertyValue("LogBoundary"));

diff --git a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
@@ -453,8 +453,8 @@ namespace Mantid
       if ( max < min )
       {
         std::stringstream ss;
-        ss << "TimeSeriesProperty::makeFilterByValue: 'max' argument must be greater than 'min'"
-           << "(got min=" << min << " max=" << max;
+        ss << "TimeSeriesProperty::makeFilterByValue: 'max' argument must be greater than 'min' "
+           << "(got min=" << min << " max=" << max << ")";
         throw std::invalid_argument(ss.str());
       }
 
@@ -540,8 +540,8 @@ namespace Mantid
       if ( max < min )
       {
         std::stringstream ss;
-        ss << "TimeSeriesProperty::expandFilterToRange: 'max' argument must be greater than 'min'"
-           << "(got min=" << min << " max=" << max;
+        ss << "TimeSeriesProperty::expandFilterToRange: 'max' argument must be greater than 'min' "
+           << "(got min=" << min << " max=" << max << ")";
         throw std::invalid_argument(ss.str());
       }