Changeset 0f9ea1c in sasview for src/sas

Timestamp:

Aug 30, 2017 4:53:27 AM (7 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2d9526d

Parents:

13991957

Message:

Make suggested stylistic changes

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitting.py (modified) (3 diffs)
• model_thread.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -1763 +1763 @@
             for plot_panel in self.parent.plot_panels.values():
                 for data_id in plot_panel.plots.keys():
-                    if data_id in plot_ids.keys():
+                    if data_id in plot_ids:
                         plot_ids[data_id].append(plot_panel.group_id)
                     else:
@@ -1777 +1777 @@
                                   data_id=pq_id)
             # Update the P(Q) and S(Q) plots if they exist
-            if sq_id in plot_ids.keys():
+            if sq_id in plot_ids:
                 # If the S(Q) theory has been plotted, update its plots
                 sq_plot.list_group_id = plot_ids[sq_id]
@@ -1789 +1789 @@
                     wx.PostEvent(self.parent, NewPlotEvent(plot=to_plot,
                         title=str(to_plot.title), group_id=to_plot.group_id))
-            if pq_id in plot_ids.keys():
+            if pq_id in plot_ids:
                 # If the P(Q) theory has been plotted, update its plots
                 pq_plot.list_group_id = plot_ids[pq_id]

src/sas/sasgui/perspectives/fitting/model_thread.py

@@ -211 +211 @@
             results = self.model.calc_composition_models(x)
             if results is not None:
-                sq_values = results[1]
-                pq_values = results[0]
+                pq_values, sq_values = results