Changeset d2b939c in sasmodels for sasmodels/sasview_model.py

Timestamp:

Feb 7, 2017 12:34:46 PM (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:

3a45c2c

Parents:

b8ddf2e (diff), fe8ff99 (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-794

File:

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

sasmodels/sasview_model.py

@@ -50 +50 @@
     """
     import sys
-    import sas
+    import sas   # needed in order to set sas.models
     import sas.sascalc.fit
     sys.modules['sas.models'] = sas.sascalc.fit
@@ -57 +57 @@
     import sas.models
     from sasmodels.conversion_table import CONVERSION_TABLE
-    for new_name, conversion in CONVERSION_TABLE.items():
-        old_name = conversion[0]
+    for new_name, conversion in CONVERSION_TABLE.get((3,1,2), {}).items():
+        # CoreShellEllipsoidModel => core_shell_ellipsoid:1
+        new_name = new_name.split(':')[0]
+        old_name = conversion[0] if len(conversion) < 3 else conversion[2]
         module_attrs = {old_name: find_model(new_name)}
         ConstructedModule = type(old_name, (), module_attrs)
@@ -228 +230 @@
     magnetic_params = []
     fixed = []
-    for p in model_info.parameters.user_parameters():
+    for p in model_info.parameters.user_parameters({}, is2d=True):
         if p.type == 'orientation':
             orientation_params.append(p.name)
@@ -352 +354 @@
         self.dispersion = collections.OrderedDict()
         self.details = {}
-        for p in self._model_info.parameters.user_parameters():
+        for p in self._model_info.parameters.user_parameters({}, is2d=True):
             if p.name in hidden:
                 continue
@@ -580 +582 @@
             raise TypeError("evalDistribution expects q or [qx, qy], not %r"
                             % 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 calculate_Iq(self, qx, qy=None):