Changeset 4ea8020 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

Timestamp:

Sep 7, 2018 9:40:56 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

c0de493

Parents:

0109f2a (diff), dcabba7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Torin Cooper-Bennun <40573959+tcbennun@…> (09/07/18 09:40:56)

git-committer:

GitHub <noreply@…> (09/07/18 09:40:56)

Message:

Merge branch 'ESS_GUI' into ESS_GUI_iss966

File:

• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

@@ -474 +474 @@
 
     theory_name = str(current_data.name.split()[0])
-    residuals.name = "Residuals for " + str(theory_name) + "[" + \
-                    str(reference_data.filename) + "]"
+    res_name = reference_data.filename if reference_data.filename else reference_data.name
+    residuals.name = "Residuals for " + str(theory_name) + "[" + res_name + "]"
     residuals.title = residuals.name
     residuals.ytransform = 'y'
@@ -501 +501 @@
     """
     weight = None
+    if data is None:
+        return []
     if is2d:
+        if not hasattr(data, 'err_data'):
+            return []
         dy_data = data.err_data
         data = data.data
     else:
+        if not hasattr(data, 'dy'):
+            return []
         dy_data = data.dy
         data = data.y