Changeset ff2b961 in sasview

Timestamp:

Oct 26, 2017 8:17:10 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Children:

1eafef1

Parents:

a7067ef2

Message:

Provide better errors for bad fits in Corfunc

File:

• src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py (modified) (3 diffs)

src/sas/qtgui/Perspectives/Corfunc/CorfuncPerspective.py

@@ -21 +21 @@
     as FigureCanvas
 from matplotlib.figure import Figure
+from numpy.linalg.linalg import LinAlgError
 
 
@@ -182 +183 @@
         """Extend the experiemntal data with guinier and porod curves."""
         self._update_calculator()
-        params, extrapolation, _ = self._calculator.compute_extrapolation()
-
-        self.model.setItem(W.W_GUINIERA, QtGui.QStandardItem(str(params['A'])))
-        self.model.setItem(W.W_GUINIERB, QtGui.QStandardItem(str(params['B'])))
-        self.model.setItem(W.W_PORODK, QtGui.QStandardItem(str(params['K'])))
-        self.model.setItem(W.W_PORODSIGMA,
-                           QtGui.QStandardItem(str(params['sigma'])))
-
-        self._canvas.extrap = extrapolation
-        self._canvas.draw_q_space()
-        self.transformBtn.setEnabled(True)
+        try:
+            params, extrapolation, _ = self._calculator.compute_extrapolation()
+            self.model.setItem(W.W_GUINIERA, QtGui.QStandardItem(str(params['A'])))
+            self.model.setItem(W.W_GUINIERB, QtGui.QStandardItem(str(params['B'])))
+            self.model.setItem(W.W_PORODK, QtGui.QStandardItem(str(params['K'])))
+            self.model.setItem(W.W_PORODSIGMA,
+                               QtGui.QStandardItem(str(params['sigma'])))
+
+            self._canvas.extrap = extrapolation
+            self._canvas.draw_q_space()
+            self.transformBtn.setEnabled(True)
+        except (LinAlgError, ValueError):
+            message = "These is not enough data in the fitting range. "\
+                      "Try decreasing the upper Q, increasing the "\
+                      "cutoff Q, or increasing the lower Q."
+            QtGui.QMessageBox.warning(self, "Calculation Error",
+                                      message)
+            self._canvas.extrap = None
+            self._canvas.draw_q_space()
+
 
     def transform(self):
@@ -260 +270 @@
         """Find a good estimate of the background value."""
         self._update_calculator()
-        background = self._calculator.compute_background()
-        temp = QtGui.QStandardItem(str(background))
-        self.model.setItem(W.W_BACKGROUND, temp)
+        try:
+            background = self._calculator.compute_background()
+            temp = QtGui.QStandardItem(str(background))
+            self.model.setItem(W.W_BACKGROUND, temp)
+        except (LinAlgError, ValueError):
+            message = "These is not enough data in the fitting range. "\
+                      "Try decreasing the upper Q or increasing the cutoff Q"
+            QtGui.QMessageBox.warning(self, "Calculation Error",
+                                      message)
+
 
     # pylint: disable=invalid-name