Changeset aad336c in sasmodels for sasmodels/models/fractal_core_shell.py


Ignore:
Timestamp:
Mar 21, 2016 9:59:28 AM (8 years ago)
Author:
richardh
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:
9418d75
Parents:
728136f
Message:

replaced wrong eqn in broad_peak doc, renamed sld's etc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/fractal_core_shell.py

    r6794301 raad336c  
    4444    q = \sqrt{q_x^2 + q_y^2} 
    4545 
    46 Reference 
    47 --------- 
     46References 
     47---------- 
    4848 
    4949See the core_shell and fractal model descriptions 
    … …  
    6565    ["radius",      "Ang",        60.0, [0, inf],    "volume", "Sphere core radius"], 
    6666    ["thickness",   "Ang",        10.0, [0, inf],    "volume", "Sphere shell thickness"], 
    67     ["core_sld",    "1e-6/Ang^2", 1.0,  [-inf, inf], "",       "Sphere core scattering length density"], 
    68     ["shell_sld",   "1e-6/Ang^2", 2.0,  [-inf, inf], "",       "Sphere shell scattering length density"], 
    69     ["solvent_sld", "1e-6/Ang^2", 3.0,  [-inf, inf], "",       "Solvent scattering length density"], 
     67    ["sld_core",    "1e-6/Ang^2", 1.0,  [-inf, inf], "",       "Sphere core scattering length density"], 
     68    ["sld_shell",   "1e-6/Ang^2", 2.0,  [-inf, inf], "",       "Sphere shell scattering length density"], 
     69    ["sld_solvent", "1e-6/Ang^2", 3.0,  [-inf, inf], "",       "Solvent scattering length density"], 
    7070    ["volfraction", "",           1.0,  [0, inf],    "",       "Volume fraction of building block spheres"], 
    7171    ["frac_dim",    "",           2.0,  [-inf, inf], "",       "Fractal dimension"], 
    … …  
    7979            radius=20, 
    8080            thickness=5, 
    81             core_sld=3.5, 
    82             shell_sld=1.0, 
    83             solvent_sld=6.35, 
     81            sld_core=3.5, 
     82            sld_shell=1.0, 
     83            sld_solvent=6.35, 
    8484            volfraction=0.05, 
    8585            frac_dim=2.0, 
    … …  
    8787 
    8888oldname = 'FractalCoreShellModel' 
    89 oldpars = {} 
     89oldpars = dict( sld_core='core_sld', 
     90               sld_shell='shell_sld', 
     91               sld_solvent='solvent_sld') 
    9092 
    9193def ER(radius, thickness): 
    … …  
    113115         [{'radius': 60.0, 
    114116           'thickness': 10.0, 
    115            'core_sld': 1.0, 
    116            'shell_sld': 2.0, 
    117            'solvent_sld': 3.0, 
     117           'sld_core': 1.0, 
     118           'sld_shell': 2.0, 
     119           'sld_solvent': 3.0, 
    118120           'background': 0.0 
    119121          }, 0.4, 0.00070126]] 
Note: See TracChangeset for help on using the changeset viewer.