Changeset aaf75b6 in sasmodels for sasmodels/product.py


Ignore:
Timestamp:
Mar 30, 2016 12:39:42 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:
885ee37
Parents:
d0876c9d (diff), 364d8f7 (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 'master' into polydisp

Conflicts:

sasmodels/direct_model.py

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/product.py

    rce896fd raaf75b6  
    2020VOLFRACTION=3 
    2121 
     22# TODO: core_shell_sphere model has suppressed the volume ratio calculation 
     23# revert it after making VR and ER available at run time as constraints. 
    2224def make_product_info(p_info, s_info): 
    2325    """ 
Note: See TracChangeset for help on using the changeset viewer.