Changeset bf8c271 in sasmodels

Timestamp:

Apr 10, 2017 10:57:40 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2662828

Parents:

b2921d0

Message:

partial fix of P(q), S(q) intermediate value display

File:

• sasmodels/sasview_model.py (modified) (3 diffs)

sasmodels/sasview_model.py

@@ -148 +148 @@
         _previous_name = model.name
         model.name = model.id
-        
+
         # If the new model name is still in the model list (for instance,
         # if we put a cylinder.py in our plug-in directory), then append
@@ -598 +598 @@
         return p_model, s_model
 
+
+    def calc_composition_models(self, qx):
+        with calculation_lock:
+            self._calculate_Iq(qx)
+            return self._intermediate_results
+
     def calculate_Iq(self, qx, qy=None):
         # type: (Sequence[float], Optional[Sequence[float]]) -> np.ndarray
@@ -637 +643 @@
         result = calculator(call_details, values, cutoff=self.cutoff,
                             magnetic=is_magnetic)
+        self._intermediate_results = getattr(calculator, 'results', None)
         calculator.release()
         self._model.release()