Changeset 19e8a2b in sasmodels


Ignore:
Timestamp:
Sep 19, 2018 1:16:52 PM (4 weeks ago)
Author:
richardh
Branches:
beta_approx
Children:
5d40d0c
Parents:
c5f7aa9 (diff), fb7c176 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'beta_approx' of https://github.com/SasView/sasmodels into beta_approx

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/compare.py

    rbd7630d rfb7c176  
    352352 
    353353    # If it is a list of choices, pick one at random with equal probability 
    354     # In practice, the model specific random generator will override. 
    355354    par = model_info.parameters[name] 
    356     if len(par.limits) > 2:  # choice list 
    357         return np.random.randint(len(par.limits)) 
     355    if par.choices:  # choice list 
     356        return np.random.randint(len(par.choices)) 
    358357 
    359358    # If it is a fixed range, pick from it with equal probability. 
  • sasmodels/models/mono_gauss_coil.py

    ree60aa7 rc5f7aa9  
    7575source = ["mono_gauss_coil.c"] 
    7676have_Fq = False 
    77 effective_radius_type = ["R_g", "2R_g", "3R_g", "(5/3)^0.5*R_g"] 
     77effective_radius_type = ["R_g", "2R_g", "3R_g", "sqrt(5/3)*R_g"] 
    7878 
    7979 
Note: See TracChangeset for help on using the changeset viewer.