Changeset fb9a3b6 in sasmodels for sasmodels/core.py

Timestamp:

Aug 31, 2017 12:07:59 PM (7 years ago)

Author:

lewis

Branches:

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

Children:

bcdd6c9

Parents:

573ffab

Message:

Allow mixture models to do multiplication as well as addition

File:

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

sasmodels/core.py

@@ -126 +126 @@
 
 
-def load_model_info(model_name):
+def load_model_info(model_name, force_mixture=False):
     # type: (str) -> modelinfo.ModelInfo
     """
@@ -134 +134 @@
     such as sphere*hardsphere or sphere+cylinder.
 
+    *force_mixture* if true, MixtureModel will be used for combining models.
+    Otherwise either MixtureModel will be used for addition and ProductModel
+    will be used for multiplication
+
     This returns a handle to the module defining the model.  This can be
     used with functions in generate to build the docs or extract model info.
@@ -139 +143 @@
     parts = model_name.split('+')
     if len(parts) > 1:
+        # Always use MixtureModel for addition
         model_info_list = [load_model_info(p) for p in parts]
         return mixture.make_mixture_info(model_info_list)
@@ -144 +149 @@
     parts = model_name.split('*')
     if len(parts) > 1:
+        if force_mixture:
+            # Use MixtureModel for multiplication if forced
+            model_info_list = [load_model_info(p) for p in parts]
+            return mixture.make_mixture_info(model_info_list, operation='*')
         if len(parts) > 2:
             raise ValueError("use P*S to apply structure factor S to model P")
+        # Use ProductModel
         P_info, Q_info = [load_model_info(p) for p in parts]
         return product.make_product_info(P_info, Q_info)