Changeset e68bae9 in sasmodels

Timestamp:

Jan 24, 2018 2:11:20 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:

7fec3b7

Parents:

ffc2a61

Message:

Give "@" a higher precedence than "*" in the combined models

As mentioned by Paul Kienzle,

"…a*b@c is parsed as a*(b@c). We don't define ER for a*b, so (a*b)@c isn't valid."

File:

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

sasmodels/core.py

@@ -152 +152 @@
                  for part in model_string.split("+")]
         return mixture.make_mixture_info(parts, operation='+')
+    elif "*" in model_string:
+        parts = [load_model_info(part)
+                 for part in model_string.split("*")]
+        return mixture.make_mixture_info(parts, operation='*')
     elif "@" in model_string:
         p_info, q_info = [load_model_info(part)
                           for part in model_string.split("@")]
         return product.make_product_info(p_info, q_info)
-    elif "*" in model_string:
-        parts = [load_model_info(part)
-                 for part in model_string.split("*")]
-        return mixture.make_mixture_info(parts, operation='*')
     # We are now dealing with a pure model
     elif "custom." in model_string: