Better X range checking

Refs #7860
mantidproject · Oct 27, 2014 · bdeb6a2 · bdeb6a2
1 parent 6a3bd52
commit bdeb6a2
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/Symmetrise.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/Symmetrise.py
@@ -60,15 +60,11 @@ def PyExec(self):
 
         sample_x = mtd[self._sample].readX(0)
 
-        if self._x_max > sample_x[len(sample_x) - 1]:
-            raise ValueError('XMax value (%f) is greater than largest X value (%f)' %
-                             (self._x_max, sample_x[len(sample_x) - 1]))
-
-        if self._x_min < sample_x[0]:
-            raise ValueError('XMin value (%f) is less than smallest X value (%f)' %
-                             (self._x_min, sample_x[0]))
-
-        self._calculate_array_points(sample_x, sample_array_len)
+        # Get slice bounds of array
+        try:
+            self._calculate_array_points(sample_x, sample_array_len)
+        except Exception as e:
+            raise RuntimeError('Failed to calculate array slice boundaries: %s' % e.message)
 
         max_sample_index = sample_array_len - 1
         centre_range_len = self._positive_min_index + self._negative_min_index
@@ -103,7 +99,6 @@ def PyExec(self):
         # Copy logs and properties from sample workspace
         CopyLogs(InputWorkspace=self._sample, OutputWorkspace=temp_ws_name)
         CopyInstrumentParameters(InputWorkspace=self._sample, OutputWorkspace=temp_ws_name)
-        # CopySample(InputWorkspace=self._sample, OutputWorkspace=temp_ws_name)
 
         # For each spectrum copy positive values to the negative
         output_spectrum_index = 0
@@ -206,6 +201,15 @@ def validateInputs(self):
             issues['XMin'] = 'XMin must be less than XMax'
             issues['XMax'] = 'XMax must be greater than XMin'
 
+        # Valudate X range against workspace X range
+        sample_x = mtd[input_workspace_name].readX(0)
+
+        if x_max > sample_x[len(sample_x) - 1]:
+            issues['XMax'] = 'XMax value (%f) is greater than largest X value (%f)' % (self._x_max, sample_x[len(sample_x) - 1])
+
+        if -x_min < sample_x[0]:
+            issues['XMin'] = 'Negative XMin value (%f) is less than smallest X value (%f)' % (-x_min, sample_x[0])
+
         return issues