Changeset b171acd in sasmodels for sasmodels/sasview_model.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/sasview_model.py (modified) (2 diffs)

sasmodels/sasview_model.py

@@ -253 +253 @@
 
     # Process multiplicity
+    control_pars = [p.id for p in model_info.parameters.kernel_parameters
+                    if p.is_control]
+    control = control_pars[0] if control_pars else None
     non_fittable = []  # type: List[str]
     xlabel = model_info.profile_axes[0] if model_info.profile is not None else ""
     variants = MultiplicityInfo(0, "", [], xlabel)
     for p in model_info.parameters.kernel_parameters:
-        if p.name == model_info.control:
+        if p.id == control:
             non_fittable.append(p.name)
             variants = MultiplicityInfo(
@@ -800 +803 @@
         """
         if par.name not in self.params:
-            if par.name == self.multiplicity_info.control:
+            if par.id == self.multiplicity_info.control:
                 return self.multiplicity, [self.multiplicity], [1.0]
             else: