Changeset 740c381 in sasview for src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

Timestamp:

Dec 6, 2018 8:50:14 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

aea6bb7

Parents:

bf7f025

Message:

Fix to solve hanging Invariant Perspective SASVIEW-1232

File:

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

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

@@ -329 +329 @@
             surface = None
 
+        if self._low_extrapolate:
+            try:
+                qstar_low, qstar_low_err = inv.get_qstar_low()
+            except Exception as ex:
+                calculation_failed = True
+                msg += str(ex)
+        if self._high_extrapolate:
+            try:
+                qstar_high, qstar_high_err = inv.get_qstar_high()
+            except Exception as ex:
+                calculation_failed = True
+                msg += str(ex)
+
         if (calculation_failed):
             logging.warning('Calculation failed: {}'.format(msg))
             return self.model
         else:
-
             if self._low_extrapolate:
-                # for presentation in InvariantDetails
-                qstar_low, qstar_low_err = inv.get_qstar_low()
                 extrapolated_data = inv.get_extra_data_low(self._low_points)
                 power_low = inv.get_extrapolation_power(range='low')
@@ -370 +380 @@
                 if qmax_plot > Q_MAXIMUM:
                     qmax_plot = Q_MAXIMUM
-                qstar_high, qstar_high_err = inv.get_qstar_high()
                 power_high = inv.get_extrapolation_power(range='high')
                 high_out_data = inv.get_extra_data_high(q_end=qmax_plot, npts=500)