Changeset b4d05bd in sasview for src/sas

Timestamp:

Aug 13, 2018 9:48:38 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:

e752ab8

Parents:

6b3a231

Message:

allow for only P(Q) or S(Q) to be present in intermediate results; improve comments

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• Perspectives/Fitting/FittingLogic.py (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -37 +37 @@
     # The controller which is responsible for managing signal slots connections
     # for the gui and providing an interface to the data model.
+
+    # This matches the ID of a plot created using FittingLogic._create1DPlot, e.g.
+    # "5 [P(Q)] modelname"
+    # or
+    # "4 modelname".
+    # Useful for determining whether the plot in question is for an intermediate result, such as P(Q) or S(Q) in the
+    # case of a product model; the identifier for this is held in square brackets, as in the example above.
     theory_plot_ID_pattern = re.compile(r"^([0-9]+)\s+(\[(.*)\]\s+)?(.*)$")
 
@@ -506 +513 @@
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:
-                # Don't plot intermediate data e.g. P(Q), S(Q)
+                # Don't plot intermediate results, e.g. P(Q), S(Q)
                 match = self.theory_plot_ID_pattern.match(plot_id)
+                # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
                 if match and match.groups()[1] != None:
                     continue

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

@@ -215 +215 @@
     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.
+        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
@@ -226 +226 @@
         pq_values, sq_values = return_data
 
-        if pq_values is not None and sq_values is not None:
+        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
-        else:
-            return None, None
+
+        return pq_plot, sq_plot
 
     def computeDataRange(self):

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

@@ -2233 +2233 @@
         # Create plots for intermediate product data
         pq_data, sq_data = self.logic.new1DProductPlots(return_data, self.tab_id)
-        if pq_data is not None and sq_data is not None:
+        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(pq_data)
             self.createNewIndex(sq_data)