Changes in / [a75347f:630156b] in sasmodels

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
@@ -586 +586 @@
                             % type(qdist))
 
-    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 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 calculate_Iq(self, qx, qy=None):
@@ -634 +637 @@
         result = calculator(call_details, values, cutoff=self.cutoff,
                             magnetic=is_magnetic)
-        self._intermediate_results = getattr(calculator, 'results', None)
         calculator.release()
         self._model.release()