Changeset 46ed760 in sasmodels


Ignore:
Timestamp:
Jul 18, 2016 12:41:13 AM (7 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:
256dfe1
Parents:
f3bd37f
Message:

enable multiplicity models, though they are not yet correct

Location:
sasmodels/models
Files:
1 edited
3 moved

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_multi_shell.py

    rf22e50e r46ed760  
    9595              ["sld_solvent", "1e-6/Ang^2", 6.4, [-inf, inf], "", 
    9696               "Solvent scattering length density"], 
    97               ["n", "", 1, [0, 10], "volume", 
     97              ["n", "", 1, [0, 4], "volume", 
    9898               "number of shells"], 
    9999              ["sld[n]", "1e-6/Ang^2", 1.7, [-inf, inf], "", 
     
    184184    return np.sum(thickness[:n], axis=0) + radius 
    185185 
    186 def VR(radius, n, thick_shell): 
     186def VR(radius, n, thickness): 
    187187    return 1.0, 1.0 
    188188 
    189189demo = dict(volfraction = 1.0, 
    190             sld = 6.4, 
     190            sld_core = 6.4, 
    191191            radius = 60, 
    192192            sld_solvent = 6.4, 
    193193            n = 1, 
    194             sld_shell = [2.0], 
    195             thick_shell = [10]) 
     194            sld = [2.0], 
     195            thickness = [10]) 
  • sasmodels/models/rpa.py

    ra5b8477 r46ed760  
    106106source = ["rpa.c"] 
    107107 
     108control = "case_num" 
    108109HIDE_NONE = set() 
    109110HIDE_A = set("Na Phia va La Kab Kac Kad".split()) 
Note: See TracChangeset for help on using the changeset viewer.