Changeset 33d7be3 in sasmodels


Ignore:
Timestamp:
Sep 7, 2018 11:04:17 AM (11 days ago)
Author:
Torin Cooper-Bennun <torin.cooper-bennun@…>
Branches:
beta_approx, beta_approx_new_R_eff
Children:
b763f9d
Parents:
2a12351
Message:

setup fixed parameter options in a sane way

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/product.py

    r5399809 r33d7be3  
    1818import numpy as np  # type: ignore 
    1919 
    20 from .modelinfo import ParameterTable, ModelInfo, Parameter 
     20from .modelinfo import ParameterTable, ModelInfo, Parameter, parse_parameter 
    2121from .kernel import KernelModel, Kernel 
    2222from .details import make_details, dispersion_mesh 
     
    4242    pars = [] 
    4343    if p_info.have_Fq: 
    44         par = Parameter("structure_factor_mode", ["P*S","P*(1+beta*(S-1))"], 0, None, "", 
     44        par = parse_parameter("structure_factor_mode", "", 0, [["P*S","P*(1+beta*(S-1))"]], "", 
    4545                        "Structure factor calculation") 
    4646        pars.append(par) 
    4747    if p_info.effective_radius_type is not None: 
    48         par = Parameter("radius_effective_mode", ["unconstrained"] + p_info.effective_radius_type, 0, None, "", 
     48        par = parse_parameter("radius_effective_mode", "", 0, [["unconstrained"] + p_info.effective_radius_type], "", 
    4949                        "Effective radius calculation") 
    5050        pars.append(par) 
Note: See TracChangeset for help on using the changeset viewer.