Changeset 4937980 in sasmodels for sasmodels/generate.py


Ignore:
Timestamp:
Apr 6, 2016 5:46:11 PM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
cb3a824, 8bd7b77
Parents:
541e7c9 (diff), e6408d0 (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 polydisp

Conflicts:

sasmodels/models/flexible_cylinder.c

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/generate.py

    rd2bb604 r4937980  
    1515 
    1616    *form_volume(p1, p2, ...)* returns the volume of the form with particular 
    17     dimension. 
     17    dimension, or 1.0 if no volume normalization is required. 
    1818 
    1919    *ER(p1, p2, ...)* returns the effective radius of the form with 
Note: See TracChangeset for help on using the changeset viewer.