Changes in / [b18e650:ad79f49] in sasmodels

File:

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

sasmodels/sasview_model.py

@@ -169 +169 @@
     return make_model_from_info(model_info)
 
-    
+
 def _register_old_models():
     # type: () -> None
@@ -597 +597 @@
                             % 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):
@@ -648 +645 @@
         result = calculator(call_details, values, cutoff=self.cutoff,
                             magnetic=is_magnetic)
+        self._intermediate_results = getattr(calculator, 'results', None)
         calculator.release()
         self._model.release()