Changes in / [e33fcd1:ccdee50] in sasview

File:

• src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py (modified) (1 diff)

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
-
-        if self._low_extrapolate:
-            extrapolated_data = inv.get_extra_data_low(self._low_points)
-            power_low = inv.get_extrapolation_power(range='low')
-
-            # Plot the chart
-            title = "Low-Q extrapolation"
-
-            # Convert the data into plottable
-            extrapolated_data = self._manager.createGuiData(extrapolated_data)
-
-            extrapolated_data.name = title
-            extrapolated_data.title = title
-            extrapolated_data.symbol = "Line"
-            extrapolated_data.has_errors = False
-
-            # copy labels and units of axes for plotting
-            extrapolated_data._xaxis = temp_data._xaxis
-            extrapolated_data._xunit = temp_data._xunit
-            extrapolated_data._yaxis = temp_data._yaxis
-            extrapolated_data._yunit = temp_data._yunit
-
-            # Add the plot to the model item
-            # This needs to run in the main thread
-            reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+        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')
+
+                # Plot the chart
+                title = "Low-Q extrapolation"
+
+                # Convert the data into plottable
+                extrapolated_data = self._manager.createGuiData(extrapolated_data)
+
+                extrapolated_data.name = title
+                extrapolated_data.title = title
+                extrapolated_data.symbol = "Line"
+                extrapolated_data.has_errors = False
+
+                # copy labels and units of axes for plotting
+                extrapolated_data._xaxis = temp_data._xaxis
+                extrapolated_data._xunit = temp_data._xunit
+                extrapolated_data._yaxis = temp_data._yaxis
+                extrapolated_data._yunit = temp_data._yunit
+
+                # Add the plot to the model item
+                # This needs to run in the main thread
+                reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
                                        self._model_item,
                                        extrapolated_data,
                                        title)
 
-        if self._high_extrapolate:
-            # for presentation in InvariantDetails
-            qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x)
-
-            if qmax_plot > Q_MAXIMUM:
-                qmax_plot = Q_MAXIMUM
-            power_high = inv.get_extrapolation_power(range='high')
-            high_out_data = inv.get_extra_data_high(q_end=qmax_plot, npts=500)
-
-            # Plot the chart
-            title = "High-Q extrapolation"
-
-            # Convert the data into plottable
-            high_out_data = self._manager.createGuiData(high_out_data)
-            high_out_data.name = title
-            high_out_data.title = title
-            high_out_data.symbol = "Line"
-            high_out_data.has_errors = False
-
-            # copy labels and units of axes for plotting
-            high_out_data._xaxis = temp_data._xaxis
-            high_out_data._xunit = temp_data._xunit
-            high_out_data._yaxis = temp_data._yaxis
-            high_out_data._yunit = temp_data._yunit
-
-            # Add the plot to the model item
-            # This needs to run in the main thread
-            reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+            if self._high_extrapolate:
+                # for presentation in InvariantDetails
+                qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x)
+
+                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)
+
+                # Plot the chart
+                title = "High-Q extrapolation"
+
+                # Convert the data into plottable
+                high_out_data = self._manager.createGuiData(high_out_data)
+                high_out_data.name = title
+                high_out_data.title = title
+                high_out_data.symbol = "Line"
+                high_out_data.has_errors = False
+
+                # copy labels and units of axes for plotting
+                high_out_data._xaxis = temp_data._xaxis
+                high_out_data._xunit = temp_data._xunit
+                high_out_data._yaxis = temp_data._yaxis
+                high_out_data._yunit = temp_data._yunit
+
+                # Add the plot to the model item
+                # This needs to run in the main thread
+                reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
                                        self._model_item, high_out_data, title)
 
-        item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction)))
-        self.model.setItem(WIDGETS.W_VOLUME_FRACTION, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction_error)))
-        self.model.setItem(WIDGETS.W_VOLUME_FRACTION_ERR, item)
-        if surface:
-            item = QtGui.QStandardItem(str(float('%.3g'% surface)))
-            self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE, item)
-            item = QtGui.QStandardItem(str(float('%.3g'% surface_error)))
-            self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE_ERR, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_total)))
-        self.model.setItem(WIDGETS.W_INVARIANT, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_total_error)))
-        self.model.setItem(WIDGETS.W_INVARIANT_ERR, item)
-
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_low)))
-        self.model.setItem(WIDGETS.D_LOW_QSTAR, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_low_err)))
-        self.model.setItem(WIDGETS.D_LOW_QSTAR_ERR, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_high)))
-        self.model.setItem(WIDGETS.D_HIGH_QSTAR, item)
-        item = QtGui.QStandardItem(str(float('%.3g'% qstar_high_err)))
-        self.model.setItem(WIDGETS.D_HIGH_QSTAR_ERR, item)
-
-        return self.model
+            item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction)))
+            self.model.setItem(WIDGETS.W_VOLUME_FRACTION, item)
+            item = QtGui.QStandardItem(str(float('%.3g'% volume_fraction_error)))
+            self.model.setItem(WIDGETS.W_VOLUME_FRACTION_ERR, item)
+            if surface:
+                item = QtGui.QStandardItem(str(float('%.3g'% surface)))
+                self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE, item)
+                item = QtGui.QStandardItem(str(float('%.3g'% surface_error)))
+                self.model.setItem(WIDGETS.W_SPECIFIC_SURFACE_ERR, item)
+            item = QtGui.QStandardItem(str(float('%.3g'% qstar_total)))
+            self.model.setItem(WIDGETS.W_INVARIANT, item)
+            item = QtGui.QStandardItem(str(float('%.3g'% qstar_total_error)))
+            self.model.setItem(WIDGETS.W_INVARIANT_ERR, item)
+
+            item = QtGui.QStandardItem(str(float('%.3g'% qstar_low)))
+            self.model.setItem(WIDGETS.D_LOW_QSTAR, item)
+            item = QtGui.QStandardItem(str(float('%.3g'% qstar_low_err)))
+            self.model.setItem(WIDGETS.D_LOW_QSTAR_ERR, item)
+            item = QtGui.QStandardItem(str(float('%.3g'% qstar_high)))
+            self.model.setItem(WIDGETS.D_HIGH_QSTAR, item)
+            item = QtGui.QStandardItem(str(float('%.3g'% qstar_high_err)))
+            self.model.setItem(WIDGETS.D_HIGH_QSTAR_ERR, item)
+
+            return self.model
 
     def title(self):