Changeset b0bebdc in sasview for src/sas/sasgui/perspectives

Timestamp:

Dec 29, 2016 1:57:56 PM (8 years ago)

Author:

mathieu

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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c1681ea

Parents:

bb3eb744

Message:

Adapt SasViewModel? to new multiplication model replacement. Fixes #209

File:

• src/sas/sasgui/perspectives/fitting/model_thread.py (modified) (2 diffs)

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

@@ -197 +197 @@
             output[index] = self.model.evalDistribution(self.data.x[index])
 
-        sq_model = None
-        pq_model = None
+        sq_values = None
+        pq_values = None
+        s_model = None
+        p_model = None
         if isinstance(self.model, MultiplicationModel):
-            sq_model = numpy.zeros((len(self.data.x)))
-            pq_model = numpy.zeros((len(self.data.x)))
-            sq_model[index] = self.model.s_model.evalDistribution(self.data.x[index])
-            pq_model[index] = self.model.p_model.evalDistribution(self.data.x[index])
+            s_model = self.model.s_model
+            p_model = self.model.p_model
+        else:
+            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])
 
         elapsed = time.time() - self.starttime
@@ -220 +228 @@
                       unsmeared_data=unsmeared_data,
                       unsmeared_error=unsmeared_error,
-                      pq_model=pq_model,
-                      sq_model=sq_model)
+                      pq_model=pq_values,
+                      sq_model=sq_values)
 
     def results(self):