Changeset 1dc1d431 in sasview for src/sas/qtgui

Timestamp:

Dec 7, 2018 9:09:00 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

44a698c

Parents:

aea6bb7

Message:

Decoupling low and high q errors

File:

• src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -329 +329 @@
             surface = None
 
+        if (calculation_failed):
+            logging.warning('Calculation failed: {}'.format(msg))
+            return self.model
+
+        low_calculation_pass = True
+        high_calculation_pass = True
         if self._low_extrapolate:
             try:
                 qstar_low, qstar_low_err = inv.get_qstar_low()
             except Exception as ex:
-                calculation_failed = True
+                low_calculation_pass = False
                 msg += str(ex)
+                logging.warning('Low-q calculation failed: {}'.format(msg))
         if self._high_extrapolate:
             try:
                 qstar_high, qstar_high_err = inv.get_qstar_high()
             except Exception as ex:
-                calculation_failed = True
+                high_calculation_pass = False
                 msg += str(ex)
-
-        if (calculation_failed):
-            logging.warning('Calculation failed: {}'.format(msg))
-            return self.model
-
-        if self._low_extrapolate:
+                logging.warning('High-q calculation failed: {}'.format(msg))
+
+
+        if self._low_extrapolate and low_calculation_pass:
             extrapolated_data = inv.get_extra_data_low(self._low_points)
             power_low = inv.get_extrapolation_power(range='low')
@@ -374 +379 @@
                                        title)
 
-        if self._high_extrapolate:
+        if self._high_extrapolate and high_calculation_pass:
             # for presentation in InvariantDetails
             qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x)