Changeset 0f9ea1c in sasview


Ignore:
Timestamp:
Aug 30, 2017 4:53:27 AM (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/fitting.py

    r62a6a78 r0f9ea1c  
    17631763            for plot_panel in self.parent.plot_panels.values(): 
    17641764                for data_id in plot_panel.plots.keys(): 
    1765                     if data_id in plot_ids.keys(): 
     1765                    if data_id in plot_ids: 
    17661766                        plot_ids[data_id].append(plot_panel.group_id) 
    17671767                    else: 
     
    17771777                                  data_id=pq_id) 
    17781778            # Update the P(Q) and S(Q) plots if they exist 
    1779             if sq_id in plot_ids.keys(): 
     1779            if sq_id in plot_ids: 
    17801780                # If the S(Q) theory has been plotted, update its plots 
    17811781                sq_plot.list_group_id = plot_ids[sq_id] 
     
    17891789                    wx.PostEvent(self.parent, NewPlotEvent(plot=to_plot, 
    17901790                        title=str(to_plot.title), group_id=to_plot.group_id)) 
    1791             if pq_id in plot_ids.keys(): 
     1791            if pq_id in plot_ids: 
    17921792                # If the P(Q) theory has been plotted, update its plots 
    17931793                pq_plot.list_group_id = plot_ids[pq_id] 
  • src/sas/sasgui/perspectives/fitting/model_thread.py

    re3f1fed r0f9ea1c  
    211211            results = self.model.calc_composition_models(x) 
    212212            if results is not None: 
    213                 sq_values = results[1] 
    214                 pq_values = results[0] 
     213                pq_values, sq_values = results 
    215214 
    216215 
Note: See TracChangeset for help on using the changeset viewer.