Changeset 426df2e in sasview

Timestamp:

Apr 11, 2017 7:31:49 AM (8 years ago)

Author:

butler

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:

c44bb26a

Parents:

24b3821

Message:

clean up code on branch addressing #741

Location:

src/sas/sasgui/perspectives/fitting

Files:

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

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

@@ -1747 +1747 @@
                                           data_id="Data  " + data.name + " unsmeared",
                                           dy=unsmeared_error)
-            # Comment this out until we can get P*S models with correctly populated parameters
             if sq_model is not None and pq_model is not None:
                 self.create_theory_1D(x, sq_model, page_id, model, data, state,

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

@@ -206 +206 @@
             s_model = self.model.s_model
             p_model = self.model.p_model
-            #sq_values = np.zeros((len(self.data.x)))
-            #pq_values = np.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])
             sq_values = s_model.evalDistribution(x)
             pq_values = p_model.evalDistribution(x)