Changeset 9ba91b7 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingLogic.py

Timestamp:

Sep 7, 2018 10:11:37 AM (6 years ago)

Author:

ibressler

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:

254199c

Parents:

d6c4987 (diff), fb560d2 (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:

Ingo Breßler <dev@…> (09/07/18 10:09:21)

git-committer:

Ingo Breßler <dev@…> (09/07/18 10:11:37)

Message:

Merge branch 'ESS_GUI' into ESS_GUI_iss1033

• fixed the conflicts introduced by dcabba7b in ESS_GUI

File:

• src/sas/qtgui/Perspectives/Fitting/FittingLogic.py (modified) (4 diffs)

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

@@ -161 +161 @@
         Create a new 1D data instance based on fitting results
         """
-        # Unpack return data from Calc1D
-        x, y, page_id, state, weight,\
-        fid, toggle_mode_on, \
-        elapsed, index, model, \
-        data, update_chisqr, source, \
-        unsmeared_output, unsmeared_data, unsmeared_error, \
-        intermediate_results = return_data
-
-        return self._create1DPlot(tab_id, x, y, model, data)
+        return self._create1DPlot(tab_id, return_data['x'], return_data['y'],
+                                  return_data['model'], return_data['data'])
 
     def new2DPlot(self, return_data):
@@ -175 +168 @@
         Create a new 2D data instance based on fitting results
         """
-        image, data, page_id, model, state, toggle_mode_on,\
-        elapsed, index, fid, qmin, qmax, weight, \
-        update_chisqr, source = return_data
+        image = return_data['image']
+        data = return_data['data']
+        model = return_data['model']
 
         np.nan_to_num(image)
@@ -183 +176 @@
         new_plot.name = model.name + '2d'
         new_plot.title = "Analytical model 2D "
-        new_plot.id = str(page_id) + " " + data.name
-        new_plot.group_id = str(page_id) + " Model2D"
+        new_plot.id = str(return_data['page_id']) + " " + data.name
+        new_plot.group_id = str(return_data['page_id']) + " Model2D"
         new_plot.detector = data.detector
         new_plot.source = data.source
@@ -218 +211 @@
         (pq_plot, sq_plot). If either are unavailable, the corresponding plot is None.
         """
-        # Unpack return data from Calc1D
-        x, y, page_id, state, weight, \
-        fid, toggle_mode_on, \
-        elapsed, index, model, \
-        data, update_chisqr, source, \
-        unsmeared_output, unsmeared_data, unsmeared_error, \
-        intermediate_results = return_data
-
         plots = []
-        for name, result in intermediate_results.items():
-            plots.append(self._create1DPlot(tab_id, x, result, model, data, component=name))
+        for name, result in return_data['intermediate_results'].items():
+            plots.append(self._create1DPlot(tab_id, return_data['x'], result,
+                         return_data['model'], return_data['data'],
+                         component=name))
         return plots