Changeset 71bf6de in sasmodels

Timestamp:

Jan 12, 2018 8:44:30 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Branches:

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

Children:

ffc2a61, 7624dd3

Parents:

791281c

Message:

First draft of solution

Location:

sasmodels

Files:

• core.py (modified) (1 diff)
• mixture.py (modified) (1 diff)

sasmodels/core.py

@@ -149 +149 @@
     """
     if '@' in model_string:
-        parts = model_string.split('@')
-        if len(parts) != 2:
-            raise ValueError("Use P@S to apply a structure factor S to model P")
-        P_info, Q_info = [load_model_info(part) for part in parts]
-        return product.make_product_info(P_info, Q_info)
+        terms = model_string.split('+')
+        results = []
+        for term in terms:
+            if '@' in term:
+                p_info, q_info = [load_model_info(part)
+                                  for part in term.split("@")]
+                results.append(product.make_product_info(p_info, q_info))
+            else:
+                results.append(load_model_info(term))
+        return mixture.make_mixture_info(results, operation='+')
+        # parts = model_string.split('@')
+        # if len(parts) != 2:
+        #     raise ValueError("Use P@S to apply a structure factor S to model P")
+        # P_info, Q_info = [load_model_info(part) for part in parts]
+        # return product.make_product_info(P_info, Q_info)
 
     product_parts = []

sasmodels/mixture.py

@@ -94 +94 @@
             # If model is a sum model, each constituent model gets its own scale parameter
             scale_prefix = prefix
-            if prefix == '' and part.operation == '*':
+            if prefix == '' and hasattr(part,"operation") and part.operation == '*':
                 # `part` is a composition product model. Find the prefixes of
                 # it's parameters to form a new prefix for the scale, eg: