Changeset c807957 in sasview for src/sas/sasgui/perspectives/fitting/model_thread.py

Timestamp:

Oct 5, 2016 11:28:25 AM (8 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

804fefa

Parents:

c65a265

Message:

Add unsmeared model to list of theories (re #687)

File:

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

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

@@ -166 +166 @@
         index = (self.qmin <= self.data.x) & (self.data.x <= self.qmax)
 
+        # If we use a smearer, also return the unsmeared model
+        output_unsmeared = None
         ##smearer the ouput of the plot
         if self.smearer is not None:
@@ -171 +173 @@
                                                              self.qmax)
             mask = self.data.x[first_bin:last_bin+1]
-            output[first_bin:last_bin+1] = self.model.evalDistribution(mask)
-            output = self.smearer(output, first_bin, last_bin)
+            output_unsmeared = numpy.zeros((len(self.data.x)))
+            output_unsmeared[first_bin:last_bin+1] = self.model.evalDistribution(mask)
+            output = self.smearer(output_unsmeared, first_bin, last_bin)
+            output_unsmeared = output_unsmeared[index]
         else:
             output[index] = self.model.evalDistribution(self.data.x[index])
@@ -187 +191 @@
                       data=self.data,
                       update_chisqr=self.update_chisqr,
-                      source=self.source)
+                      source=self.source,
+                      unsmeared_model=output_unsmeared)
 
     def results(self):