Changeset dd02bce in sasmodels for sasmodels/sasview_model.py

Timestamp:

Sep 5, 2017 10:59:18 AM (7 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:

a57a902

Parents:

44ca3e1 (diff), 142a8e2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-741

File:

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

sasmodels/sasview_model.py

@@ -595 +595 @@
                             % type(qdist))
 
-    def get_composition_models(self):
-        """
-            Returns usable models that compose this model
-        """
-        s_model = None
-        p_model = None
-        if hasattr(self._model_info, "composition") \
-           and self._model_info.composition is not None:
-            p_model = _make_model_from_info(self._model_info.composition[1][0])()
-            s_model = _make_model_from_info(self._model_info.composition[1][1])()
-        return p_model, s_model
+    def calc_composition_models(self, qx):
+        """
+        returns parts of the composition model or None if not a composition
+        model.
+        """
+        with calculation_lock:
+            self._calculate_Iq(qx)
+            return self._intermediate_results
 
     def calculate_Iq(self, qx, qy=None):
@@ -646 +643 @@
         result = calculator(call_details, values, cutoff=self.cutoff,
                             magnetic=is_magnetic)
+        self._intermediate_results = getattr(calculator, 'results', None)
         calculator.release()
         self._model.release()