Changeset 6a0c75d1 in sasview for src/sas/sasgui/perspectives

Timestamp:

Oct 5, 2016 1:15:31 PM (8 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

edbe974

Parents:

804fefa

Message:

Make sure dy is always filled (re #687)

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -1680 +1680 @@
         """
         new_plot = Data1D(x=x, y=y)
-        new_plot.is_data = dy is not None
+        if dy is None:
+            new_plot.is_data = False
+            new_plot.dy = numpy.zeros(len(y))
+            # If this is a theory curve, pick the proper symbol to make it a curve
+            new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
+        else:
+            new_plot.is_data = True
+            new_plot.dy = dy
         new_plot.interactive = True
-        new_plot.dy = dy
         new_plot.dx = None
         new_plot.dxl = None
         new_plot.dxw = None
-        # If this is a theory curve, pick the proper symbol to make it a curve
-        if not new_plot.is_data:
-            new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
         _yaxis, _yunit = data.get_yaxis()
         _xaxis, _xunit = data.get_xaxis()