Changeset 439ffcd in sasmodels


Ignore:
Timestamp:
Oct 30, 2017 11:29:12 AM (7 years ago)
Author:
gonzalezm
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
ee95012
Parents:
1f35235
Message:

Fixes #1006

Location:
sasmodels
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_multi_shell.py

    r1511c37c r439ffcd  
    118118    return pars 
    119119 
    120 def profile(sld_core, radius, sld_solvent, n, sld, thickness): 
     120def profile(sld_core, radius, sld_solvent, n, sld, thickness, **kwargs): 
    121121    """ 
    122122    Returns the SLD profile *r* (Ang), and *rho* (1e-6/Ang^2). 
  • sasmodels/models/onion.py

    rca04add r439ffcd  
    318318profile_axes = ['Radius (A)', 'SLD (1e-6/A^2)'] 
    319319def profile(sld_core, radius_core, sld_solvent, n_shells, 
    320             sld_in, sld_out, thickness, A): 
     320            sld_in, sld_out, thickness, A, **kwargs): 
    321321    """ 
    322322    Returns shape profile with x=radius, y=SLD. 
  • sasmodels/models/spherical_sld.py

    rca04add r439ffcd  
    222222 
    223223def profile(n_shells, sld_solvent, sld, thickness, 
    224             interface, shape, nu, n_steps): 
     224            interface, shape, nu, n_steps, **kwargs): 
    225225    """ 
    226226    Returns shape profile with x=radius, y=SLD. 
  • sasmodels/product.py

    r1f35235 r439ffcd  
    101101    model_info.composition = ('product', [p_info, s_info]) 
    102102    model_info.control = p_info.control 
     103    model_info.hidden = p_info.hidden 
     104    model_info.profile = p_info.profile 
     105    model_info.profile_axes = p_info.profile_axes 
     106     
    103107    # TODO: delegate random to p_info, s_info 
    104108    #model_info.random = lambda: {} 
Note: See TracChangeset for help on using the changeset viewer.