Changeset 7b3e62c in sasmodels for sasmodels/core.py

Timestamp:

Mar 16, 2016 10:07:19 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

91c5fdc

Parents:

8e45182

Message:

support load_model('p*q')

File:

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

sasmodels/core.py

@@ -46 +46 @@
     Load model info and build model.
     """
+    parts = model_name.split('+')
+    if len(parts) > 1:
+        from .mixture import MixtureModel
+        models = [load_model(p, **kw) for p in parts]
+        return MixtureModel(models)
+
+    parts = model_name.split('*')
+    if len(parts) > 1:
+        # Note: currently have circular reference
+        from .product import ProductModel
+        if len(parts) > 2:
+            raise ValueError("use P*S to apply structure factor S to model P")
+        P, Q = [load_model(p, **kw) for p in parts]
+        return ProductModel(P, Q)
+
     return build_model(load_model_info(model_name), **kw)
 
@@ -55 +70 @@
     used with functions in generate to build the docs or extract model info.
     """
+    #import sys; print "\n".join(sys.path)
     __import__('sasmodels.models.'+model_name)
     kernel_module = getattr(models, model_name, None)