Changeset 9dcb21d in sasmodels

Timestamp:

Apr 11, 2017 10:20:36 AM (8 years ago)

Author:

butler

Branches:

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

Children:

a75347f

Parents:

2662828

Message:

final clean up addressing #741. Removed old get_compostion_models now
that it is replaced with calc_composition_models.

File:

• sasmodels/sasview_model.py (modified) (1 diff)

sasmodels/sasview_model.py

@@ -586 +586 @@
                             % 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)