Changeset ecfe6b6 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Aug 13, 2018 10:02:02 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:

799963c

Parents:

4e255d1 (diff), e752ab8 (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.

Message:

Merge branch 'ESS_GUI_iss976' into ESS_GUI.

SASVIEW-976: Make intermediate data from product models (i.e. P(Q) and S(Q)) plottable.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingLogic.py (modified) (4 diffs)
• FittingWidget.py (modified) (2 diffs)
• ModelThread.py (modified) (2 diffs)
• UnitTesting/FittingLogicTest.py (modified) (1 diff)
• FittingPerspective.py (modified) (1 diff)

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/or S(Q) data, create 1D plots for each and return as the tuple
+        (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, \
+        pq_values, sq_values = return_data
+
+        pq_plot = None
+        sq_plot = None
+
+        if pq_values is not None:
+            pq_plot = self._create1DPlot(tab_id, x, pq_values, model, data, component="P(Q)")
+        if sq_values is not None:
+            sq_plot = self._create1DPlot(tab_id, x, sq_values, model, data, component="S(Q)")
+
+        return pq_plot, sq_plot
+
     def computeDataRange(self):
         """

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

@@ -2113 +2113 @@
             self.updateModelIndex(fitted_data)
         else:
-            name = self.nameForFittedData(self.kernel_module.id)
+            if not fitted_data.name:
+                name = self.nameForFittedData(self.kernel_module.id)
+            else:
+                name = fitted_data.name
             fitted_data.title = name
-            fitted_data.name = name
             fitted_data.filename = name
             fitted_data.symbol = "Line"
@@ -2229 +2231 @@
         self.model_data = fitted_data
 
+        # Create plots for intermediate product data
+        pq_data, sq_data = self.logic.new1DProductPlots(return_data, self.tab_id)
+        if pq_data is not None:
+            pq_data.symbol = "Line"
+            self.createNewIndex(pq_data)
+        if sq_data is not None:
+            sq_data.symbol = "Line"
+            self.createNewIndex(sq_data)
+
     def complete2D(self, return_data):
         """

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

@@ -222 +222 @@
             s_model = self.model.s_model
             p_model = self.model.p_model
-        elif hasattr(self.model, "get_composition_models"):
-            p_model, s_model = self.model.get_composition_models()
-
-        if p_model is not None and s_model is not None:
-            sq_values = numpy.zeros((len(self.data.x)))
-            pq_values = numpy.zeros((len(self.data.x)))
-            sq_values[index] = s_model.evalDistribution(self.data.x[index])
-            pq_values[index] = p_model.evalDistribution(self.data.x[index])
+        elif hasattr(self.model, "calc_composition_models"):
+            results = self.model.calc_composition_models(self.data.x[index])
+            if results is not None:
+                pq_values, sq_values = results
+
+        if pq_values is None or sq_values is None:
+            if p_model is not None and s_model is not None:
+                sq_values = numpy.zeros((len(self.data.x)))
+                pq_values = numpy.zeros((len(self.data.x)))
+                sq_values[index] = s_model.evalDistribution(self.data.x[index])
+                pq_values[index] = p_model.evalDistribution(self.data.x[index])
 
         elapsed = time.time() - self.starttime
@@ -243 +246 @@
                     self.data,
                     self.update_chisqr,
-                    self.source)
+                    self.source,
+                    unsmeared_output, unsmeared_data, unsmeared_error,
+                    pq_values, sq_values)
         else:
             self.complete(x=self.data.x[index], y=output[index],

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -100 +100 @@
         data.id = "poop"
         return_data = (data.x,data.y, 7, None, None,
-                        0, True, 0.0, 1, data,
-                        data, False, None)
+                       0, True, 0.0, 1, data,
+                       data, False, None,
+                       None, None, None,
+                       None, None)
 
         new_plot = self.logic.new1DPlot(return_data=return_data, tab_id=0)

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

@@ -115 +115 @@
         Add a new tab for passed data
         """
-        tab     = FittingWidget(parent=self.parent, data=data, tab_id=self.maxIndex+1)
+        tab     = FittingWidget(parent=self.parent, data=data, tab_id=self.maxIndex)
         tab.is_batch_fitting = is_batch