Changeset 3ae9179 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingLogic.py

Timestamp:

Aug 10, 2018 6:17:13 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

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:

44777ee

Parents:

a2cc8b97

Message:

intermediate P(Q), S(Q) values are now saved in Data Explorer and are plottable

File:

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

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

@@ -132 +132 @@
         self._data.ymax = ymax
 
-    def new1DPlot(self, return_data, tab_id):
-        """
-        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 = return_data
-
+    def _create1DPlot(self, tab_id, x, y, model, data, component=None):
+        """
+        For internal use: create a new 1D data instance based on fitting results
+        component is a string indicating the model component, e.g. "P(Q)"
+        """
         # Create the new plot
         new_plot = Data1D(x=x, y=y)
@@ -150 +145 @@
 
         new_plot.group_id = data.group_id
-        new_plot.id = str(tab_id) + " " + model.id
-
-        if data.filename:
-            new_plot.name = model.name + " [" + data.filename + "]" # data file
-        else:
-            new_plot.name = model.name + " [" + model.id + "]"  # theory
+        new_plot.id = str(tab_id) + " " + ("[" + component + "] " if component else "") + model.id
+
+        # use data.filename for data, use model.id for theory
+        id_str = data.filename if data.filename else model.id
+        new_plot.name = model.name + ((" " + component) if component else "") + " [" + id_str + "]"
 
         new_plot.title = new_plot.name
@@ -162 +156 @@
 
         return new_plot
+
+    def new1DPlot(self, return_data, tab_id):
+        """
+        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, \
+        pq_values, sq_values = return_data
+
+        return self._create1DPlot(tab_id, x, y, model, data)
 
     def new2DPlot(self, return_data):
@@ -205 +213 @@
         return new_plot
 
+    def new1DProductPlots(self, return_data, tab_id):
+        """
+        If return_data contains separated P(Q) and S(Q) data, create 1D plots for each and return as a tuple.
+        Returns (None, None) if this data is unavailable.
+        """
+        # 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, \
+        pq_values, sq_values = return_data
+
+        if pq_values is not None and sq_values is not None:
+            pq_plot = self._create1DPlot(tab_id, x, pq_values, model, data, component="P(Q)")
+            sq_plot = self._create1DPlot(tab_id, x, sq_values, model, data, component="S(Q)")
+
+            return pq_plot, sq_plot
+        else:
+            return None, None
+
     def computeDataRange(self):
         """