Changeset 5181e9b in sasview

Timestamp:

Sep 8, 2018 5:34:11 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f3e5956

Parents:

254199c

Message:

ModelThread? supports sasmodels beta_approx version of calculate_Iq, which returns intermediate results

File:

• src/sas/qtgui/Perspectives/Fitting/ModelThread.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Fitting/ModelThread.py

@@ -164 +164 @@
         index = (self.qmin <= self.data.x) & (self.data.x <= self.qmax)
 
+        intermediate_results = None
+
         # If we use a smearer, also return the unsmeared model
         unsmeared_output = None
@@ -174 +176 @@
             mask = self.data.x[first_bin:last_bin+1]
             unsmeared_output = numpy.zeros((len(self.data.x)))
-            unsmeared_output[first_bin:last_bin+1] = self.model.evalDistribution(mask)
+
+            return_data = self.model.calculate_Iq(mask)
+            if isinstance(return_data, tuple):
+                # see sasmodels beta_approx: SasviewModel.calculate_Iq
+                # TODO: implement intermediate results in smearers
+                return_data, _ = return_data
+            unsmeared_output[first_bin:last_bin+1] = return_data
             output = self.smearer(unsmeared_output, first_bin, last_bin)
 
@@ -193 +201 @@
                 unsmeared_error=unsmeared_error
         else:
-            output[index] = self.model.evalDistribution(self.data.x[index])
-
-        results_eval = {}
-        intermediate_results = getattr(self.model, "_intermediate_results", None)
-        if callable(intermediate_results):
-            # support for future sasmodels (beta approx support) - it returns a dict of intermediate results, keyed by
-            # name
-            results_eval = intermediate_results()
-        else:
+            return_data = self.model.calculate_Iq(self.data.x[index])
+            if isinstance(return_data, tuple):
+                # see sasmodels beta_approx: SasviewModel.calculate_Iq
+                return_data, intermediate_results = return_data
+            output[index] = return_data
+
+        if intermediate_results:
+            # the model returns a callable which is then used to retrieve the data
+            intermediate_results = intermediate_results()
+        else:
+            # TODO: this conditional branch needs refactoring
             sq_values = None
             pq_values = None
             s_model = None
             p_model = None
+
             if isinstance(self.model, MultiplicationModel):
                 s_model = self.model.s_model
                 p_model = self.model.p_model
+
             elif hasattr(self.model, "calc_composition_models"):
                 results = self.model.calc_composition_models(self.data.x[index])
@@ -222 +234 @@
 
             if pq_values is not None and sq_values is not None:
-                results_eval = {
+                intermediate_results  = {
                     "P(Q)": pq_values,
                     "S(Q)": sq_values
                 }
+            else:
+                intermediate_results = {}
 
         elapsed = time.time() - self.starttime
@@ -236 +250 @@
             source = self.source, unsmeared_output = unsmeared_output,
             unsmeared_data = unsmeared_data, unsmeared_error = unsmeared_error,
-            intermediate_results = results_eval)
+            intermediate_results = intermediate_results)
 
         if LocalConfig.USING_TWISTED: