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


Ignore:
Timestamp:
Mar 21, 2016 7: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/core_shell_bicelle.py

    r43b7eea raad336c  
    44---------- 
    55This model provides the form factor for a circular cylinder with a core-shell 
    6 scattering length density profile. The form factor is normalized by the 
    7 particle volume. 
     6scattering length density profile. Thus this is a variation of a core-shell cylinder  
     7or disc where the shell on the walls and ends may be of different thicknesses and scattering 
     8length densities. The form factor is normalized by the particle volume. 
    89 
    910.. _core-shell-bicelle-geometry: 
    … …  
    1112.. figure:: img/core_shell_bicelle_geometry.png 
    1213 
    13     (Graphic from DOI: 10.1039/C0NP00002G) 
     14    (Graphic from DOI: 10.1039/C0NP00002G, note however that the model here calculates for rectangular, not curved, rims.) 
    1415 
    1516 
    … …  
    4344title = "Circular cylinder with a core-shell scattering length density profile.." 
    4445description = """ 
    45     P(q,alpha)= scale/Vs*f(q)^(2) + bkg,  where: f(q)= 2(core_sld 
     46    P(q,alpha)= scale/Vs*f(q)^(2) + bkg,  where: f(q)= 2(sld_core 
    4647    - solvant_sld)* Vc*sin[qLcos(alpha/2)] 
    4748    /[qLcos(alpha/2)]*J1(qRsin(alpha)) 
    48     /[qRsin(alpha)]+2(shell_sld-solvent_sld) 
     49    /[qRsin(alpha)]+2(shell_sld-sld_solvent) 
    4950    *Vs*sin[q(L+T)cos(alpha/2)][[q(L+T) 
    5051    *cos(alpha/2)]*J1(q(R+T)sin(alpha)) 
    … …  
    5859    shell_sld: the scattering length density 
    5960    of the shell 
    60     solvent_sld: the scattering length density 
     61    sld_solvent: the scattering length density 
    6162    of the solvent 
    6263    bkg: the background 
    … …  
    7778    ["face_thickness", "Ang",       10, [0, inf],    "volume",      "Cylinder face thickness"], 
    7879    ["length",         "Ang",      400, [0, inf],    "volume",      "Cylinder length"], 
    79     ["core_sld",       "1e-6/Ang^2", 1, [-inf, inf], "",            "Cylinder core scattering length density"], 
    80     ["face_sld",       "1e-6/Ang^2", 4, [-inf, inf], "",            "Cylinder face scattering length density"], 
    81     ["rim_sld",        "1e-6/Ang^2", 4, [-inf, inf], "",            "Cylinder rim scattering length density"], 
    82     ["solvent_sld",    "1e-6/Ang^2", 1, [-inf, inf], "",            "Solvent scattering length density"], 
     80    ["sld_core",       "1e-6/Ang^2", 1, [-inf, inf], "",            "Cylinder core scattering length density"], 
     81    ["sld_face",       "1e-6/Ang^2", 4, [-inf, inf], "",            "Cylinder face scattering length density"], 
     82    ["sld_rim",        "1e-6/Ang^2", 4, [-inf, inf], "",            "Cylinder rim scattering length density"], 
     83    ["sld_solvent",    "1e-6/Ang^2", 1, [-inf, inf], "",            "Solvent scattering length density"], 
    8384    ["theta",          "degrees",   90, [-inf, inf], "orientation", "In plane angle"], 
    8485    ["phi",            "degrees",    0, [-inf, inf], "orientation", "Out of plane angle"], 
    … …  
    9495            face_thickness=10.0, 
    9596            length=400.0, 
    96             core_sld=1.0, 
    97             face_sld=4.0, 
    98             rim_sld=4.0, 
    99             solvent_sld=1.0, 
     97            sld_core=1.0, 
     98            sld_face=4.0, 
     99            sld_rim=4.0, 
     100            sld_solvent=1.0, 
    100101            theta=90, 
    101102            phi=0) 
    … …  
    103104oldname = 'CoreShellBicelleModel' 
    104105 
    105 oldpars = dict(rim_thickness='rim_thick', 
     106oldpars = dict(sld_core='core_sld', sld_face='face_sld', sld_rim='rim_sld', 
     107               sld_solvent='solvent_sld', rim_thickness='rim_thick', 
    106108               face_thickness='face_thick', 
    107109               theta='axis_theta', 
    … …  
    115117      'face_thickness': 10.0, 
    116118      'length': 400.0, 
    117       'core_sld': 1.0, 
    118       'face_sld': 4.0, 
    119       'rim_sld': 4.0, 
    120       'solvent_sld': 1.0, 
     119      'sld_core': 1.0, 
     120      'sld_face': 4.0, 
     121      'sld_rim': 4.0, 
     122      'sld_solvent': 1.0, 
    121123      'background': 0.0, 
    122124     }, 0.001, 353.550], 
    … …  
    126128      'face_thickness': 10.0, 
    127129      'length': 400.0, 
    128       'core_sld': 1.0, 
    129       'face_sld': 4.0, 
    130       'rim_sld': 4.0, 
    131       'solvent_sld': 1.0, 
     130      'sld_core': 1.0, 
     131      'sld_face': 4.0, 
     132      'sld_rim': 4.0, 
     133      'sld_solvent': 1.0, 
    132134      'theta': 90.0, 
    133135      'phi': 0.0, 
    … …  
    140142      'face_thickness': 100.0, 
    141143      'length': 1200.0, 
    142       'core_sld': 5.0, 
    143       'face_sld': 41.0, 
    144       'rim_sld': 42.0, 
    145       'solvent_sld': 21.0, 
     144      'sld_core': 5.0, 
     145      'sld_face': 41.0, 
     146      'sld_rim': 42.0, 
     147      'sld_solvent': 21.0, 
    146148     }, 0.05, 1670.1828], 
    147149    ] 
Note: See TracChangeset for help on using the changeset viewer.