Changeset 33d7be3 in sasmodels for sasmodels/product.py

Timestamp:

Sep 7, 2018 9:04:17 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

b763f9d

Parents:

2a12351b

Message:

setup fixed parameter options in a sane way

File:

• sasmodels/product.py (modified) (2 diffs)

sasmodels/product.py

@@ -18 +18 @@
 import numpy as np  # type: ignore
 
-from .modelinfo import ParameterTable, ModelInfo, Parameter
+from .modelinfo import ParameterTable, ModelInfo, Parameter, parse_parameter
 from .kernel import KernelModel, Kernel
 from .details import make_details, dispersion_mesh
@@ -42 +42 @@
     pars = []
     if p_info.have_Fq:
-        par = Parameter("structure_factor_mode", ["P*S","P*(1+beta*(S-1))"], 0, None, "",
+        par = parse_parameter("structure_factor_mode", "", 0, [["P*S","P*(1+beta*(S-1))"]], "",
                         "Structure factor calculation")
         pars.append(par)
     if p_info.effective_radius_type is not None:
-        par = Parameter("radius_effective_mode", ["unconstrained"] + p_info.effective_radius_type, 0, None, "",
+        par = parse_parameter("radius_effective_mode", "", 0, [["unconstrained"] + p_info.effective_radius_type], "",
                         "Effective radius calculation")
         pars.append(par)