Changeset b171acd in sasmodels for sasmodels/mixture.py

Timestamp:

Jan 29, 2019 1:54:28 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

4f4d3e3

Parents:

15c80af

Message:

move 'multiplicity' handling into sasview model. Refs #1022.

File:

• sasmodels/mixture.py (modified) (3 diffs)

sasmodels/mixture.py

@@ -34 +34 @@
     # Build new parameter list
     combined_pars = []
-    control = None
 
     all_parts = copy(parts)
@@ -117 +116 @@
                 p.length_control = prefix + p.length_control
             combined_pars.append(p)
-            if p.is_control and control is None:
-                control = p.id
     parameters = ParameterTable(combined_pars)
     parameters.max_pd = sum(part.parameters.max_pd for part in parts)
@@ -132 +129 @@
     model_info = ModelInfo()
     model_info.id = operation.join(part.id for part in parts)
-    model_info.control = control
     model_info.operation = operation
     model_info.name = '(' + operation.join(part.name for part in parts) + ')'