Changeset ca4d985 in sasview

Timestamp:

Oct 5, 2016 12:52:56 PM (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:

cbbb6a4, 3fac0df

Parents:

edbe974

Message:

S(q), P(q) plots. Fixes #209

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitting.py (modified) (2 diffs)
• model_thread.py (modified) (3 diffs)

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

@@ -1723 +1723 @@
                     source='model', plot_result=True,
                     unsmeared_model=None, unsmeared_data=None,
-                    unsmeared_error=None):
+                    unsmeared_error=None, sq_model=None, pq_model=None):
         """
             Complete plotting 1D data
@@ -1744 +1744 @@
                                       data_id="Data  " + data.name + " unsmeared",
                                       dy=unsmeared_error)
+                
+            if sq_model is not None and pq_model is not None:
+                self.create_theory_1D(x, sq_model, page_id, model, data, state,
+                                      data_description=model.name + " S(q)",
+                                      data_id=str(page_id) + " " + data.name + " S(q)")
+                self.create_theory_1D(x, pq_model, page_id, model, data, state,
+                                      data_description=model.name + " P(q)",
+                                      data_id=str(page_id) + " " + data.name + " P(q)")
+
 
             current_pg = self.fit_panel.get_page_by_id(page_id)

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

@@ -7 +7 @@
 import math
 from sas.sascalc.data_util.calcthread import CalcThread
+from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
 
 class Calc2D(CalcThread):
@@ -194 +195 @@
             output[index] = self.model.evalDistribution(self.data.x[index])
 
+        sq_model = None
+        pq_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])
+
         elapsed = time.time() - self.starttime
 
@@ -208 +217 @@
                       unsmeared_model=unsmeared_output,
                       unsmeared_data=unsmeared_data,
-                      unsmeared_error=unsmeared_error)
+                      unsmeared_error=unsmeared_error,
+                      pq_model=pq_model,
+                      sq_model=sq_model)
 
     def results(self):