Changes in / [259b116:02226a2] in sasmodels

Files:

• .travis.yml (modified) (2 diffs)
• sasmodels/convert.py (modified) (1 diff)
• sasmodels/modelinfo.py (modified) (3 diffs)
• sasmodels/product.py (modified) (1 diff)
• sasmodels/sasview_model.py (modified) (2 diffs)

.travis.yml

@@ -9 +9 @@
   - os: linux
     env:
-    - PY=3.7
+    - PY=3.6
   - os: osx
     language: generic
@@ -17 +17 @@
     language: generic
     env:
-    - PY=3.7
+    - PY=3.5
 branches:
   only:

sasmodels/convert.py

@@ -105 +105 @@
                     translation[newid+str(k)] = oldid+str(k)
     # Remove control parameter from the result
-    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"
+    if model_info.control:
+        translation[model_info.control] = "CONTROL"
     return translation
 

sasmodels/modelinfo.py

@@ -290 +290 @@
     example, might be used to set the value of a shape parameter.
 
-    Control parameters are used for variant models such as :ref:`rpa` which
-    have different cases with different parameters, as well as models
-    like :ref:`spherical_sld` with its user defined number of shells.
-    The control parameter should appear in the parameter table along with the
-    parameters it is is controlling.  For variant models, use *[CASES]* in
-    place of the parameter limits Within the parameter definition table,
-    with case names such as::
-
-         CASES = ["diblock copolymer", "triblock copolymer", ...]
-
-    This should give *limits=[[case1, case2, ...]]*, but the model loader
-    translates it to *limits=[0, len(CASES)-1]*, and adds *choices=CASES* to
-    the :class:`Parameter` definition. Note that models can use a list of
-    cases as a parameter without it being a control parameter.  Either way,
-    the parameter is sent to the model evaluator as *float(choice_num)*,
-    where choices are numbered from 0. :meth:`ModelInfo.get_hidden_parameters`
-    will determine which parameers to display.
-
-    The class contructor should not be called directly, but instead the
-    parameter table is built using :func:`make_parameter_table` and
+    These values are set by :func:`make_parameter_table` and
     :func:`parse_parameter` therein.
     """
@@ -864 +845 @@
     info.single = getattr(kernel_module, 'single', not callable(info.Iq))
     info.random = getattr(kernel_module, 'random', None)
+
+    # multiplicity info
+    control_pars = [p.id for p in parameters.kernel_parameters if p.is_control]
+    default_control = control_pars[0] if control_pars else None
+    info.control = getattr(kernel_module, 'control', default_control)
     info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore
-
-    # Set control flag for explicitly set parameters, e.g., in the RPA model.
-    control = getattr(kernel_module, 'control', None)
-    if control is not None:
-        parameters[control].is_control = True
 
     if callable(info.Iq) and parameters.has_2d:
@@ -922 +903 @@
     #: *sphere*hardsphere* or *cylinder+sphere*.
     composition = None      # type: Optional[Tuple[str, List[ModelInfo]]]
+    #: Name of the control parameter for a variant model such as :ref:`rpa`.
+    #: The *control* parameter should appear in the parameter table, with
+    #: limits defined as *[CASES]*, for case names such as
+    #: *CASES = ["diblock copolymer", "triblock copolymer", ...]*.
+    #: This should give *limits=[[case1, case2, ...]]*, but the
+    #: model loader translates this to *limits=[0, len(CASES)-1]*, and adds
+    #: *choices=CASES* to the :class:`Parameter` definition. Note that
+    #: models can use a list of cases as a parameter without it being a
+    #: control parameter.  Either way, the parameter is sent to the model
+    #: evaluator as *float(choice_num)*, where choices are numbered from 0.
+    #: See also :attr:`hidden`.
+    control = None          # type: str
     #: Different variants require different parameters.  In order to show
     #: just the parameters needed for the variant selected by :attr:`control`,

sasmodels/product.py

@@ -128 +128 @@
     # Remember the component info blocks so we can build the model
     model_info.composition = ('product', [p_info, s_info])
+    model_info.control = p_info.control
     model_info.hidden = p_info.hidden
     if getattr(p_info, 'profile', None) is not None:

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_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_id:
+        if p.name == model_info.control:
             non_fittable.append(p.name)
             variants = MultiplicityInfo(
@@ -835 +832 @@
         """
         if par.name not in self.params:
-            if par.id == self.multiplicity_info.control:
+            if par.name == self.multiplicity_info.control:
                 return self.multiplicity, [self.multiplicity], [1.0]
             else: