Changeset 21c93c3 in sasmodels

Timestamp:

Mar 6, 2019 4:14:41 PM (6 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:

fd7291e

Parents:

f3767c2

Message:

fix translation of 3.x models with control parameters to 4.2

Location:

sasmodels

Files:

• convert.py (modified) (1 diff)
• sasview_model.py (modified) (1 diff)

sasmodels/convert.py

@@ -105 +105 @@
                     translation[newid+str(k)] = oldid+str(k)
     # Remove control parameter from the result
-    if model_info.control:
-        translation[model_info.control] = "CONTROL"
+    control_pars = [p.id for p in model_info.parameters.kernel_parameters
+                    if p.is_control]
+    if control_pars:
+        control_id = control_pars[0]
+        translation[control_id] = "CONTROL"
     return translation
 

sasmodels/sasview_model.py

@@ -255 +255 @@
     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
+    control_id = 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.id == control:
+        if p.id == control_id:
             non_fittable.append(p.name)
             variants = MultiplicityInfo(