Changeset 31ae428 in sasmodels

Timestamp:

Sep 5, 2017 11:20:36 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:

a85a569

Parents:

60335cc

Message:

Fix labelling of mixture model parameters

File:

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

sasmodels/mixture.py

@@ -79 +79 @@
                 i += npars
 
-    model_num = len(all_parts) - len(parts)
-    if model_num != 0:
-        model_num += 1
-
-    for k, part in enumerate(parts):
+    for part in parts:
         # Parameter prefix per model, A_, B_, ...
         # Note that prefix must also be applied to id and length_control
         # to support vector parameters
-        prefix = chr(ord('A')+k+model_num) + '_'
-        if part.composition and part.composition[0] == 'mixture':
-            # Parameter already has a prefix as it's part of a composition model
-            prefix = ''
-            model_num -= 1
+        prefix = ''
+        if not part.composition:
+            # Model isn't a composition model, so it's parameters don't have a
+            # a prefix. Add the next available prefix
+            prefix = chr(ord('A')+len(used_prefixes))
+            used_prefixes.append(prefix)
+            prefix += '_'
             
         if operation == '+':