Changeset 4f6f7b63 in sasmodels


Ignore:
Timestamp:
Sep 9, 2018 4:41:17 AM (2 months ago)
Author:
richardh
Branches:
beta_approx, py3, ticket-1015-gpu-mem-error, ticket-1157, ticket-608-user-defined-weights, ticket_1156
Children:
3f818b2
Parents:
e8eff7b (diff), c952e59 (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_new_R_eff' of https://github.com/SasView/sasmodels into beta_approx_new_R_eff

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/sasview_model.py

    r2773c66 rc952e59  
    381381                continue 
    382382            self.params[p.name] = p.default 
    383             if p.limits and type(p.limits) is list and len(p.limits) > 1: 
    384                 self.details[p.id] = [p.units if not p.choices else p.choices, p.limits[0], p.limits[1]] 
    385             else: 
    386                 self.details[p.id] = [p.units if not p.choices else p.choices, None, None] 
     383            self.details[p.id] = [p.units, p.limits[0], p.limits[1]] 
    387384            if p.polydisperse: 
    388385                self.details[p.id+".width"] = [ 
  • sasmodels/models/spherical_sld.py

    rc44b611 re8eff7b  
    217217              ["interface[n_shells]",  "Ang",        50.0,   [0, inf],       "volume", "thickness of the interface"], 
    218218              ["shape[n_shells]",      "",           0,      [SHAPES],       "", "interface shape"], 
    219               ["nu[n_shells]",         "",           2.5,    [0, inf],       "", "interface shape exponent"], 
     219              ["nu[n_shells]",         "",           2.5,    [1, inf],       "", "interface shape exponent"], 
    220220              ["n_steps",              "",           35,     [0, inf],       "", "number of steps in each interface (must be an odd integer)"], 
    221221             ] 
Note: See TracChangeset for help on using the changeset viewer.