Ignore:
Timestamp:
Mar 30, 2019 2:06:15 PM (5 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master
Children:
be0942c
Parents:
a42b091 (diff), e15a822 (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 remote-tracking branch 'origin/master' into ticket-1263-source-link

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_shell_bicelle_elliptical.py

    rc1e44e5 rd57b06c  
    147147          "core_shell_bicelle_elliptical.c"] 
    148148have_Fq = True 
    149 effective_radius_type = [ 
     149radius_effective_modes = [ 
    150150    "equivalent cylinder excluded volume", "equivalent volume sphere", 
    151151    "outer rim average radius", "outer rim min radius", 
Note: See TracChangeset for help on using the changeset viewer.