Changeset 0edb6c1 in sasmodels for sasmodels/product.py

Timestamp:

Sep 12, 2017 5:12:03 AM (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:

9d1e3e4

Parents:

2ad5d30 (diff), 22e922e (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 'ticket-767' of ​https://github.com/lewisodriscoll/sasmodels into ticket-767

File:

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

sasmodels/product.py

@@ -81 +81 @@
 
     model_info = ModelInfo()
-    model_info.id = '*'.join((p_id, s_id))
-    model_info.name = '*'.join((p_name, s_name))
+    model_info.id = '@'.join((p_id, s_id))
+    model_info.name = '@'.join((p_name, s_name))
     model_info.filename = None
     model_info.title = 'Product of %s and %s'%(p_name, s_name)