Changeset 42356c8 in sasmodels


Ignore:
Timestamp:
Jul 21, 2016 2:09:17 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:
32e3c9b
Parents:
d680a2b
Message:

label all sld parameters

Location:
sasmodels/models
Files:
44 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/adsorbed_layer.py

    r7abcc59 r42356c8  
    9494Iq.vectorized =  True  # Iq accepts an array of q values 
    9595 
    96 def Iqxy(qx, qy, *args): 
    97     # pylint: disable = missing-docstring 
    98     return Iq(sqrt(qx ** 2 + qy ** 2), *args) 
    99 Iqxy.vectorized = True # Iqxy accepts an array of qx, qy values 
    100  
    10196# unit test values taken from SasView 3.1.2 
    10297tests =  [ 
  • sasmodels/models/barbell.py

    rec45c4f r42356c8  
    101101# pylint: disable=bad-whitespace, line-too-long 
    102102#             ["name", "units", default, [lower, upper], "type","description"], 
    103 parameters = [["sld",         "1e-6/Ang^2",   4, [-inf, inf], "",            "Barbell scattering length density"], 
    104               ["sld_solvent", "1e-6/Ang^2",   1, [-inf, inf], "",            "Solvent scattering length density"], 
     103parameters = [["sld",         "1e-6/Ang^2",   4, [-inf, inf], "sld",         "Barbell scattering length density"], 
     104              ["sld_solvent", "1e-6/Ang^2",   1, [-inf, inf], "sld",         "Solvent scattering length density"], 
    105105              ["bell_radius", "Ang",         40, [0, inf],    "volume",      "Spherical bell radius"], 
    106106              ["radius",      "Ang",         20, [0, inf],    "volume",      "Cylindrical bar radius"], 
  • sasmodels/models/bcc_paracrystal.py

    rec45c4f r42356c8  
    116116              ["d_factor",    "",            0.06, [-inf, inf], "",            "Paracrystal distortion factor"], 
    117117              ["radius",      "Ang",        40,    [0, inf],    "volume",      "Particle radius"], 
    118               ["sld",         "1e-6/Ang^2",  4,    [-inf, inf], "",            "Particle scattering length density"], 
    119               ["sld_solvent", "1e-6/Ang^2",  1,    [-inf, inf], "",            "Solvent scattering length density"], 
     118              ["sld",         "1e-6/Ang^2",  4,    [-inf, inf], "sld",         "Particle scattering length density"], 
     119              ["sld_solvent", "1e-6/Ang^2",  1,    [-inf, inf], "sld",         "Solvent scattering length density"], 
    120120              ["theta",       "degrees",    60,    [-inf, inf], "orientation", "In plane angle"], 
    121121              ["phi",         "degrees",    60,    [-inf, inf], "orientation", "Out of plane angle"], 
  • sasmodels/models/binary_hard_sphere.py

    rec45c4f r42356c8  
    101101              ["volfraction_sm", "", 0.2, [0, 1], "", 
    102102               "volume fraction of small particle"], 
    103               ["sld_lg", "1e-6/Ang^2", 3.5, [-inf, inf], "", 
     103              ["sld_lg", "1e-6/Ang^2", 3.5, [-inf, inf], "sld", 
    104104               "scattering length density of large particle"], 
    105               ["sld_sm", "1e-6/Ang^2", 0.5, [-inf, inf], "", 
     105              ["sld_sm", "1e-6/Ang^2", 0.5, [-inf, inf], "sld", 
    106106               "scattering length density of small particle"], 
    107               ["sld_solvent", "1e-6/Ang^2", 6.36, [-inf, inf], "", 
     107              ["sld_solvent", "1e-6/Ang^2", 6.36, [-inf, inf], "sld", 
    108108               "Solvent scattering length density"], 
    109109             ] 
  • sasmodels/models/capped_cylinder.py

    rec45c4f r42356c8  
    109109# pylint: disable=bad-whitespace, line-too-long 
    110110#             ["name", "units", default, [lower, upper], "type", "description"], 
    111 parameters = [["sld",         "1e-6/Ang^2", 4, [-inf, inf], "",       "Cylinder scattering length density"], 
    112               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "",       "Solvent scattering length density"], 
     111parameters = [["sld",         "1e-6/Ang^2", 4, [-inf, inf], "sld",    "Cylinder scattering length density"], 
     112              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld",    "Solvent scattering length density"], 
    113113              ["radius",      "Ang",       20, [0, inf],    "volume", "Cylinder radius"], 
    114114 
  • sasmodels/models/core_multi_shell.py

    r263daec r42356c8  
    8787 
    8888#             ["name", "units", default, [lower, upper], "type","description"], 
    89 parameters = [["sld_core", "1e-6/Ang^2", 1.0, [-inf, inf], "", 
     89parameters = [["sld_core", "1e-6/Ang^2", 1.0, [-inf, inf], "sld", 
    9090               "Core scattering length density"], 
    9191              ["radius", "Ang", 200., [0, inf], "volume", 
    9292               "Radius of the core"], 
    93               ["sld_solvent", "1e-6/Ang^2", 6.4, [-inf, inf], "", 
     93              ["sld_solvent", "1e-6/Ang^2", 6.4, [-inf, inf], "sld", 
    9494               "Solvent scattering length density"], 
    9595              ["n", "", 1, [0, 10], "volume", 
    9696               "number of shells"], 
    97               ["sld[n]", "1e-6/Ang^2", 1.7, [-inf, inf], "", 
     97              ["sld[n]", "1e-6/Ang^2", 1.7, [-inf, inf], "sld", 
    9898               "scattering length density of shell k"], 
    9999              ["thickness[n]", "Ang", 40., [0, inf], "volume", 
  • sasmodels/models/core_shell_bicelle.py

    rec45c4f r42356c8  
    7878    ["face_thickness", "Ang",       10, [0, inf],    "volume",      "Cylinder face thickness"], 
    7979    ["length",         "Ang",      400, [0, inf],    "volume",      "Cylinder length"], 
    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"], 
     80    ["sld_core",       "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Cylinder core scattering length density"], 
     81    ["sld_face",       "1e-6/Ang^2", 4, [-inf, inf], "sld",         "Cylinder face scattering length density"], 
     82    ["sld_rim",        "1e-6/Ang^2", 4, [-inf, inf], "sld",         "Cylinder rim scattering length density"], 
     83    ["sld_solvent",    "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Solvent scattering length density"], 
    8484    ["theta",          "degrees",   90, [-inf, inf], "orientation", "In plane angle"], 
    8585    ["phi",            "degrees",    0, [-inf, inf], "orientation", "Out of plane angle"], 
  • sasmodels/models/core_shell_cylinder.py

    rec45c4f r42356c8  
    112112 
    113113#             ["name", "units", default, [lower, upper], "type", "description"], 
    114 parameters = [["sld_core", "1e-6/Ang^2", 4, [-inf, inf], "", 
     114parameters = [["sld_core", "1e-6/Ang^2", 4, [-inf, inf], "sld", 
    115115               "Cylinder core scattering length density"], 
    116               ["sld_shell", "1e-6/Ang^2", 4, [-inf, inf], "", 
     116              ["sld_shell", "1e-6/Ang^2", 4, [-inf, inf], "sld", 
    117117               "Cylinder shell scattering length density"], 
    118               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
     118              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    119119               "Solvent scattering length density"], 
    120120              ["radius", "Ang", 20, [0, inf], "volume", 
  • sasmodels/models/core_shell_ellipsoid_xt.py

    rec45c4f r42356c8  
    9292    ["t_shell",       "Ang",       30,   [0, inf],    "volume",      "thickness of shell at equator"], 
    9393    ["x_polar_shell", "",           1,   [0, inf],    "volume",      "ratio of thickness of shell at pole to that at equator"], 
    94     ["sld_core",      "1e-6/Ang^2", 2,   [-inf, inf], "",            "Core scattering length density"], 
    95     ["sld_shell",     "1e-6/Ang^2", 1,   [-inf, inf], "",            "Shell scattering length density"], 
    96     ["sld_solvent",   "1e-6/Ang^2", 6.3, [-inf, inf], "",            "Solvent scattering length density"], 
     94    ["sld_core",      "1e-6/Ang^2", 2,   [-inf, inf], "sld",         "Core scattering length density"], 
     95    ["sld_shell",     "1e-6/Ang^2", 1,   [-inf, inf], "sld",         "Shell scattering length density"], 
     96    ["sld_solvent",   "1e-6/Ang^2", 6.3, [-inf, inf], "sld",         "Solvent scattering length density"], 
    9797    ["theta",         "degrees",    0,   [-inf, inf], "orientation", "Oblate orientation wrt incoming beam"], 
    9898    ["phi",           "degrees",    0,   [-inf, inf], "orientation", "Oblate orientation in the plane of the detector"], 
  • sasmodels/models/core_shell_parallelepiped.py

    r500128b r42356c8  
    114114 
    115115#             ["name", "units", default, [lower, upper], "type","description"], 
    116 parameters = [["sld_core", "1e-6/Ang^2", 1, [-inf, inf], "", 
     116parameters = [["sld_core", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    117117               "Parallelepiped core scattering length density"], 
    118               ["sld_a", "1e-6/Ang^2", 2, [-inf, inf], "", 
     118              ["sld_a", "1e-6/Ang^2", 2, [-inf, inf], "sld", 
    119119               "Parallelepiped A rim scattering length density"], 
    120               ["sld_b", "1e-6/Ang^2", 4, [-inf, inf], "", 
     120              ["sld_b", "1e-6/Ang^2", 4, [-inf, inf], "sld", 
    121121               "Parallelepiped B rim scattering length density"], 
    122               ["sld_c", "1e-6/Ang^2", 2, [-inf, inf], "", 
     122              ["sld_c", "1e-6/Ang^2", 2, [-inf, inf], "sld", 
    123123               "Parallelepiped C rim scattering length density"], 
    124               ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "", 
     124              ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "sld", 
    125125               "Solvent scattering length density"], 
    126126              ["a_side", "Ang", 35, [0, inf], "volume", 
  • sasmodels/models/core_shell_sphere.py

    rec45c4f r42356c8  
    6464parameters = [["radius",      "Ang",        60.0, [0, inf],    "volume", "Sphere core radius"], 
    6565              ["thickness",   "Ang",        10.0, [0, inf],    "volume", "Sphere shell thickness"], 
    66               ["sld_core",    "1e-6/Ang^2", 1.0,  [-inf, inf], "",       "core scattering length density"], 
    67               ["sld_shell",   "1e-6/Ang^2", 2.0,  [-inf, inf], "",       "shell scattering length density"], 
    68               ["sld_solvent", "1e-6/Ang^2", 3.0,  [-inf, inf],  "",      "Solvent scattering length density"]] 
     66              ["sld_core",    "1e-6/Ang^2", 1.0,  [-inf, inf], "sld",    "core scattering length density"], 
     67              ["sld_shell",   "1e-6/Ang^2", 2.0,  [-inf, inf], "sld",    "shell scattering length density"], 
     68              ["sld_solvent", "1e-6/Ang^2", 3.0,  [-inf, inf], "sld",    "Solvent scattering length density"]] 
    6969# pylint: enable=bad-whitespace, line-too-long 
    7070 
  • sasmodels/models/cylinder.py

    r7ae2b7f r42356c8  
    105105 
    106106#             [ "name", "units", default, [lower, upper], "type", "description"], 
    107 parameters = [["sld", "4e-6/Ang^2", 4, [-inf, inf], "", 
     107parameters = [["sld", "4e-6/Ang^2", 4, [-inf, inf], "sld", 
    108108               "Cylinder scattering length density"], 
    109               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
     109              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    110110               "Solvent scattering length density"], 
    111111              ["radius", "Ang", 20, [0, inf], "volume", 
  • sasmodels/models/ellipsoid.py

    rec45c4f r42356c8  
    118118 
    119119#             ["name", "units", default, [lower, upper], "type","description"], 
    120 parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "", 
     120parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "sld", 
    121121               "Ellipsoid scattering length density"], 
    122               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
     122              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    123123               "Solvent scattering length density"], 
    124124              ["r_polar", "Ang", 20, [0, inf], "volume", 
  • sasmodels/models/elliptical_cylinder.py

    r416609b r42356c8  
    9494#             ["name", "units", default, [lower, upper], "type","description"], 
    9595parameters = [["r_minor",     "Ang",        20.0,  [0, inf],    "volume",      "Ellipse minor radius"], 
    96               ["axis_ratio",     "",           1.5,   [1, inf],    "volume",      "Ratio of major radius over minor radius"], 
     96              ["axis_ratio",   "",          1.5,   [1, inf],    "volume",      "Ratio of major radius over minor radius"], 
    9797              ["length",      "Ang",        400.0, [1, inf],    "volume",      "Length of the cylinder"], 
    98               ["sld",         "1e-6/Ang^2", 4.0,   [-inf, inf], "",            "Cylinder scattering length density"], 
    99               ["sld_solvent", "1e-6/Ang^2", 1.0,   [-inf, inf], "",            "Solvent scattering length density"], 
     98              ["sld",         "1e-6/Ang^2", 4.0,   [-inf, inf], "sld",         "Cylinder scattering length density"], 
     99              ["sld_solvent", "1e-6/Ang^2", 1.0,   [-inf, inf], "sld",         "Solvent scattering length density"], 
    100100              ["theta",       "degrees",    90.0,  [-360, 360], "orientation", "In plane angle"], 
    101101              ["phi",         "degrees",    0,     [-360, 360], "orientation", "Out of plane angle"], 
  • sasmodels/models/fcc_paracrystal.py

    rec45c4f r42356c8  
    108108              ["d_factor", "", 0.06, [-inf, inf], "", "Paracrystal distortion factor"], 
    109109              ["radius", "Ang", 40, [0, inf], "volume", "Particle radius"], 
    110               ["sld", "1e-6/Ang^2", 4, [-inf, inf], "", "Particle scattering length density"], 
    111               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", "Solvent scattering length density"], 
     110              ["sld", "1e-6/Ang^2", 4, [-inf, inf], "sld", "Particle scattering length density"], 
     111              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", "Solvent scattering length density"], 
    112112              ["theta", "degrees", 60, [-inf, inf], "orientation", "In plane angle"], 
    113113              ["phi", "degrees", 60, [-inf, inf], "orientation", "Out of plane angle"], 
  • sasmodels/models/flexible_cylinder.py

    rec45c4f r42356c8  
    8080    ["kuhn_length", "Ang",        100.0, [0, inf],    "volume", "Kuhn length of the flexible cylinder"], 
    8181    ["radius",      "Ang",         20.0, [0, inf],    "volume", "Radius of the flexible cylinder"], 
    82     ["sld",         "1e-6/Ang^2",   1.0, [-inf, inf], "",       "Cylinder scattering length density"], 
    83     ["sld_solvent", "1e-6/Ang^2",   6.3, [-inf, inf], "",       "Solvent scattering length density"], 
     82    ["sld",         "1e-6/Ang^2",   1.0, [-inf, inf], "sld",    "Cylinder scattering length density"], 
     83    ["sld_solvent", "1e-6/Ang^2",   6.3, [-inf, inf], "sld",    "Solvent scattering length density"], 
    8484    ] 
    8585# pylint: enable=bad-whitespace, line-too-long 
  • sasmodels/models/flexible_cylinder_elliptical.py

    rec45c4f r42356c8  
    104104    ["radius",      "Ang",         20.0, [1, inf],    "volume", "Radius of the flexible cylinder"], 
    105105    ["axis_ratio",  "",             1.5, [0, inf],    "",       "Axis_ratio (major_radius/minor_radius"], 
    106     ["sld",         "1e-6/Ang^2",   1.0, [-inf, inf], "",       "Cylinder scattering length density"], 
    107     ["sld_solvent", "1e-6/Ang^2",   6.3, [-inf, inf], "",       "Solvent scattering length density"], 
     106    ["sld",         "1e-6/Ang^2",   1.0, [-inf, inf], "sld",    "Cylinder scattering length density"], 
     107    ["sld_solvent", "1e-6/Ang^2",   6.3, [-inf, inf], "sld",    "Solvent scattering length density"], 
    108108    ] 
    109109# pylint: enable=bad-whitespace, line-too-long 
  • sasmodels/models/fractal.py

    rec45c4f r42356c8  
    8787              ["cor_length", "Ang", 100.0, [0.0, inf], "", 
    8888               "cluster correlation length"], 
    89               ["sld_block", "1e-6/Ang^2", 2.0, [-inf, inf], "", 
     89              ["sld_block", "1e-6/Ang^2", 2.0, [-inf, inf], "sld", 
    9090               "scattering length density of particles"], 
    91               ["sld_solvent", "1e-6/Ang^2", 6.4, [-inf, inf], "", 
     91              ["sld_solvent", "1e-6/Ang^2", 6.4, [-inf, inf], "sld", 
    9292               "scattering length density of solvent"], 
    9393             ] 
  • sasmodels/models/fractal_core_shell.py

    rec45c4f r42356c8  
    6565    ["radius",      "Ang",        60.0, [0, inf],    "volume", "Sphere core radius"], 
    6666    ["thickness",   "Ang",        10.0, [0, inf],    "volume", "Sphere shell thickness"], 
    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"], 
     67    ["sld_core",    "1e-6/Ang^2", 1.0,  [-inf, inf], "sld",    "Sphere core scattering length density"], 
     68    ["sld_shell",   "1e-6/Ang^2", 2.0,  [-inf, inf], "sld",    "Sphere shell scattering length density"], 
     69    ["sld_solvent", "1e-6/Ang^2", 3.0,  [-inf, inf], "sld",    "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"], 
  • sasmodels/models/fuzzy_sphere.py

    rec45c4f r42356c8  
    7676# pylint: disable=bad-whitespace,line-too-long 
    7777# ["name", "units", default, [lower, upper], "type","description"], 
    78 parameters = [["sld",         "1e-6/Ang^2",  1, [-inf, inf], "",       "Particle scattering length density"], 
    79               ["sld_solvent", "1e-6/Ang^2",  3, [-inf, inf], "",       "Solvent scattering length density"], 
     78parameters = [["sld",         "1e-6/Ang^2",  1, [-inf, inf], "sld",    "Particle scattering length density"], 
     79              ["sld_solvent", "1e-6/Ang^2",  3, [-inf, inf], "sld",    "Solvent scattering length density"], 
    8080              ["radius",      "Ang",        60, [0, inf],    "volume", "Sphere radius"], 
    8181              ["fuzziness",   "Ang",        10, [0, inf],    "",       "std deviation of Gaussian convolution for interface (must be << radius)"], 
  • sasmodels/models/hollow_cylinder.py

    rec45c4f r42356c8  
    7272    ["core_radius", "Ang",     20.0, [0, inf],    "volume",      "Hollow core radius"], 
    7373    ["length",      "Ang",    400.0, [0, inf],    "volume",      "Cylinder length"], 
    74     ["sld",         "1/Ang^2",  6.3, [-inf, inf], "",            "Cylinder sld"], 
    75     ["sld_solvent", "1/Ang^2",  1,   [-inf, inf], "",            "Solvent sld"], 
     74    ["sld",         "1/Ang^2",  6.3, [-inf, inf], "sld",         "Cylinder sld"], 
     75    ["sld_solvent", "1/Ang^2",  1,   [-inf, inf], "sld",         "Solvent sld"], 
    7676    ["theta",       "degrees", 90,   [-360, 360], "orientation", "Theta angle"], 
    7777    ["phi",         "degrees",  0,   [-360, 360], "orientation", "Phi angle"], 
  • sasmodels/models/hollow_rectangular_prism.py

    r117090a r42356c8  
    101101 
    102102#             ["name", "units", default, [lower, upper], "type","description"], 
    103 parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "", 
     103parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "sld", 
    104104               "Parallelepiped scattering length density"], 
    105               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
     105              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    106106               "Solvent scattering length density"], 
    107107              ["a_side", "Ang", 35, [0, inf], "volume", 
  • sasmodels/models/hollow_rectangular_prism_thin_walls.py

    rec45c4f r42356c8  
    8787 
    8888#             ["name", "units", default, [lower, upper], "type","description"], 
    89 parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "", 
     89parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "sld", 
    9090               "Parallelepiped scattering length density"], 
    91               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
     91              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    9292               "Solvent scattering length density"], 
    9393              ["a_side", "Ang", 35, [0, inf], "volume", 
  • sasmodels/models/lamellar.py

    r56b2687 r42356c8  
    6262#             ["name", "units", default, [lower, upper], "type","description"], 
    6363parameters = [ ["thickness", "Ang", 50, [0, inf], "volume","total layer thickness" ], 
    64                ["sld", "1e-6/Ang^2", 1, [-inf, inf], "","Layer scattering length density" ], 
    65                ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "","Solvent scattering length density" ], 
     64               ["sld", "1e-6/Ang^2", 1, [-inf, inf], "sld","Layer scattering length density" ], 
     65               ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "sld","Solvent scattering length density" ], 
    6666             ] 
    6767 
  • sasmodels/models/lamellar_hg.py

    rd2bb604 r42356c8  
    7272parameters = [["tail_length", "Ang",       15,   [0, inf],  "volume",  "Tail thickness ( total = H+T+T+H)"], 
    7373              ["head_length", "Ang",       10,   [0, inf],  "volume",  "Head thickness"], 
    74               ["sld",         "1e-6/Ang^2", 0.4, [-inf,inf], "",       "Tail scattering length density"], 
    75               ["sld_head",    "1e-6/Ang^2", 3.0, [-inf,inf], "",       "Head scattering length density"], 
    76               ["sld_solvent", "1e-6/Ang^2", 6,   [-inf,inf], "",       "Solvent scattering length density"]] 
     74              ["sld",         "1e-6/Ang^2", 0.4, [-inf,inf], "sld",    "Tail scattering length density"], 
     75              ["sld_head",    "1e-6/Ang^2", 3.0, [-inf,inf], "sld",    "Head scattering length density"], 
     76              ["sld_solvent", "1e-6/Ang^2", 6,   [-inf,inf], "sld",    "Solvent scattering length density"]] 
    7777# pylint: enable=bad-whitespace, line-too-long 
    7878 
  • sasmodels/models/lamellar_hg_stack_caille.py

    rd2bb604 r42356c8  
    104104    ["Caille_parameter", "", 0.001, [0.0, 0.8], "", 
    105105     "Caille parameter"], 
    106     ["sld", "1e-6/Ang^2", 0.4, [-inf, inf], "", 
     106    ["sld", "1e-6/Ang^2", 0.4, [-inf, inf], "sld", 
    107107     "Tail scattering length density"], 
    108     ["sld_head", "1e-6/Ang^2", 2.0, [-inf, inf], "", 
     108    ["sld_head", "1e-6/Ang^2", 2.0, [-inf, inf], "sld", 
    109109     "Head scattering length density"], 
    110     ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "", 
     110    ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "sld", 
    111111     "Solvent scattering length density"], 
    112112    ] 
  • sasmodels/models/lamellar_stack_caille.py

    rd2bb604 r42356c8  
    9191    ["spacing",          "Ang",      400.,  [0.0,inf],  "volume", "d-spacing of Caille S(Q)"], 
    9292    ["Caille_parameter", "1/Ang^2",    0.1, [0.0,0.8],  "",       "Caille parameter"], 
    93     ["sld",              "1e-6/Ang^2", 6.3, [-inf,inf], "",       "layer scattering length density"], 
    94     ["sld_solvent",      "1e-6/Ang^2", 1.0, [-inf,inf], "",       "Solvent scattering length density"], 
     93    ["sld",              "1e-6/Ang^2", 6.3, [-inf,inf], "sld",    "layer scattering length density"], 
     94    ["sld_solvent",      "1e-6/Ang^2", 1.0, [-inf,inf], "sld",    "Solvent scattering length density"], 
    9595    ] 
    9696# pylint: enable=bad-whitespace, line-too-long 
  • sasmodels/models/lamellar_stack_paracrystal.py

    rd2bb604 r42356c8  
    119119              ["spacing_polydisp", "Ang", 0.0, [0.0, inf], "", 
    120120               "d-spacing polydispersity"], 
    121               ["sld", "1e-6/Ang^2", 1.0, [-inf, inf], "", 
     121              ["sld", "1e-6/Ang^2", 1.0, [-inf, inf], "sld", 
    122122               "layer scattering length density"], 
    123               ["sld_solvent", "1e-6/Ang^2", 6.34, [-inf, inf], "", 
     123              ["sld_solvent", "1e-6/Ang^2", 6.34, [-inf, inf], "sld", 
    124124               "Solvent scattering length density"], 
    125125             ] 
  • sasmodels/models/linear_pearls.py

    rec45c4f r42356c8  
    5757    ["edge_sep",    "Ang",      350.0, [0, inf],     "", "Length of the string segment - surface to surface"], 
    5858    ["num_pearls",  "",           3.0, [0, inf],     "", "Number of the pearls"], 
    59     ["sld",   "1e-6/Ang^2", 1.0, [-inf, inf],  "", "SLD of the pearl spheres"], 
    60     ["sld_solvent", "1e-6/Ang^2", 6.3, [-inf, inf],  "", "SLD of the solvent"], 
     59    ["sld",   "1e-6/Ang^2", 1.0, [-inf, inf],  "sld", "SLD of the pearl spheres"], 
     60    ["sld_solvent", "1e-6/Ang^2", 6.3, [-inf, inf],  "sld", "SLD of the solvent"], 
    6161    ] 
    6262# pylint: enable=bad-whitespace, line-too-long 
  • sasmodels/models/multilayer_vesicle.py

    rec45c4f r42356c8  
    7474    ["volfraction", "",  0.05, [0.0, 1],  "", "volume fraction of vesicles"], 
    7575    ["radius", "Ang", 60.0, [0.0, inf],  "", "Core radius of the multishell"], 
    76     ["thick_shell", "Ang",        10.0, [0.0, inf],  "", "Shell thickness"], 
     76    ["thick_shell", "Ang",        10.0, [0.0, inf],  "sld", "Shell thickness"], 
    7777    ["thick_solvent", "Ang",        10.0, [0.0, inf],  "", "Water thickness"], 
    78     ["sld_solvent",    "1e-6/Ang^2",  6.4, [-inf, inf], "", "Core scattering length density"], 
    79     ["sld",   "1e-6/Ang^2",  0.4, [-inf, inf], "", "Shell scattering length density"], 
     78    ["sld_solvent",    "1e-6/Ang^2",  6.4, [-inf, inf], "sld", "Core scattering length density"], 
     79    ["sld",   "1e-6/Ang^2",  0.4, [-inf, inf], "sld", "Shell scattering length density"], 
    8080    ["n_pairs",     "",            2.0, [1.0, inf],  "", "Number of pairs of water and shell"], 
    8181    ] 
  • sasmodels/models/onion.py

    ra0494e9 r42356c8  
    293293 
    294294#             ["name", "units", default, [lower, upper], "type","description"], 
    295 parameters = [["sld_core", "1e-6/Ang^2", 1.0, [-inf, inf], "", 
     295parameters = [["sld_core", "1e-6/Ang^2", 1.0, [-inf, inf], "sld", 
    296296               "Core scattering length density"], 
    297297              ["core_radius", "Ang", 200., [0, inf], "volume", 
    298298               "Radius of the core"], 
    299               ["sld_solvent", "1e-6/Ang^2", 6.4, [-inf, inf], "", 
     299              ["sld_solvent", "1e-6/Ang^2", 6.4, [-inf, inf], "sld", 
    300300               "Solvent scattering length density"], 
    301301              ["n_shells", "", 1, [0, 10], "volume", 
    302302               "number of shells"], 
    303               ["sld_in[n_shells]", "1e-6/Ang^2", 1.7, [-inf, inf], "", 
     303              ["sld_in[n_shells]", "1e-6/Ang^2", 1.7, [-inf, inf], "sld", 
    304304               "scattering length density at the inner radius of shell k"], 
    305               ["sld_out[n_shells]", "1e-6/Ang^2", 2.0, [-inf, inf], "", 
     305              ["sld_out[n_shells]", "1e-6/Ang^2", 2.0, [-inf, inf], "sld", 
    306306               "scattering length density at the outer radius of shell k"], 
    307307              ["thickness[n_shells]", "Ang", 40., [0, inf], "volume", 
  • sasmodels/models/parallelepiped.py

    rec45c4f r42356c8  
    177177 
    178178#             ["name", "units", default, [lower, upper], "type","description"], 
    179 parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "", 
     179parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "sld", 
    180180               "Parallelepiped scattering length density"], 
    181               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
     181              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    182182               "Solvent scattering length density"], 
    183183              ["a_side", "Ang", 35, [0, inf], "volume", 
  • sasmodels/models/pearl_necklace.py

    rec45c4f r42356c8  
    8484              ["number_of_pearls", "none", 3, [0, inf], "volume", 
    8585               "Number of pearls in the necklace (must be integer)"], 
    86               ["sld", "1e-6/Ang^2", 1.0, [-inf, inf], "", 
     86              ["sld", "1e-6/Ang^2", 1.0, [-inf, inf], "sld", 
    8787               "Scattering length density of the chained spheres"], 
    88               ["sld_string", "1e-6/Ang^2", 1.0, [-inf, inf], "", 
     88              ["sld_string", "1e-6/Ang^2", 1.0, [-inf, inf], "sld", 
    8989               "Scattering length density of the chain linkage"], 
    90               ["sld_solvent", "1e-6/Ang^2", 6.3, [-inf, inf], "", 
     90              ["sld_solvent", "1e-6/Ang^2", 6.3, [-inf, inf], "sld", 
    9191               "Scattering length density of the solvent"], 
    9292             ] 
  • sasmodels/models/polymer_micelle.py

    rec45c4f r42356c8  
    4141    ["v_core",        "Ang^3",  62624.0,  [0.0, inf], "", "Core volume "], 
    4242    ["v_corona",      "Ang^3",  61940.0,  [0.0, inf], "", "Corona volume"], 
    43     ["sld_solvent",   "1e-6/Ang^2", 6.4,  [0.0, inf], "", "Solvent scattering length density"], 
    44     ["sld_core",      "1e-6/Ang^2", 0.34, [0.0, inf], "", "Core scattering length density"], 
    45     ["sld_corona",    "1e-6/Ang^2", 0.8,  [0.0, inf], "", "Corona scattering length density"], 
     43    ["sld_solvent",   "1e-6/Ang^2", 6.4,  [0.0, inf], "sld", "Solvent scattering length density"], 
     44    ["sld_core",      "1e-6/Ang^2", 0.34, [0.0, inf], "sld", "Core scattering length density"], 
     45    ["sld_corona",    "1e-6/Ang^2", 0.8,  [0.0, inf], "sld", "Corona scattering length density"], 
    4646    ["radius_core",   "Ang",       45.0,  [0.0, inf], "", "Radius of core ( must be >> radius_gyr )"], 
    4747    ["radius_gyr",    "Ang",       20.0,  [0.0, inf], "", "Radius of gyration of chains in corona"], 
  • sasmodels/models/pringle.py

    rec45c4f r42356c8  
    6868    ["alpha",       "",            0.001,  [-inf, inf], "", "Curvature parameter alpha"], 
    6969    ["beta",        "",            0.02,   [-inf, inf], "", "Curvature paramter beta"], 
    70     ["sld_pringle", "1e-6/Ang^2",  1.0,    [-inf, inf], "", "Pringle sld"], 
    71     ["sld_solvent", "1e-6/Ang^2",  6.3,    [-inf, inf], "", "Solvent sld"] 
     70    ["sld_pringle", "1e-6/Ang^2",  1.0,    [-inf, inf], "sld", "Pringle sld"], 
     71    ["sld_solvent", "1e-6/Ang^2",  6.3,    [-inf, inf], "sld", "Solvent sld"] 
    7272    ] 
    7373# pylint: enable=bad-whitespace, line-too-long 
  • sasmodels/models/raspberry.py

    rec45c4f r42356c8  
    132132 
    133133#             [ "name", "units", default, [lower, upper], "type", "description"], 
    134 parameters = [["sld_lg", "1e-6/Ang^2", -0.4, [-inf, inf], "", 
     134parameters = [["sld_lg", "1e-6/Ang^2", -0.4, [-inf, inf], "sld", 
    135135               "large particle scattering length density"], 
    136               ["sld_sm", "1e-6/Ang^2", 3.5, [-inf, inf], "", 
     136              ["sld_sm", "1e-6/Ang^2", 3.5, [-inf, inf], "sld", 
    137137               "small particle scattering length density"], 
    138               ["sld_solvent", "1e-6/Ang^2", 6.36, [-inf, inf], "", 
     138              ["sld_solvent", "1e-6/Ang^2", 6.36, [-inf, inf], "sld", 
    139139               "solvent scattering length density"], 
    140140              ["volfraction_lg", "", 0.05, [-inf, inf], "", 
  • sasmodels/models/rectangular_prism.py

    rec45c4f r42356c8  
    9595 
    9696#             ["name", "units", default, [lower, upper], "type","description"], 
    97 parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "", 
     97parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "sld", 
    9898               "Parallelepiped scattering length density"], 
    99               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
     99              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    100100               "Solvent scattering length density"], 
    101101              ["a_side", "Ang", 35, [0, inf], "volume", 
  • sasmodels/models/sc_paracrystal.py

    r500128b r42356c8  
    122122# pylint: disable=bad-whitespace, line-too-long 
    123123#             ["name", "units", default, [lower, upper], "type","description"], 
    124 parameters = [["dnn",         "Ang",       220.0,  [0.0, inf],  "",            "Nearest neighbor distance"], 
    125               ["d_factor",    "",            0.06, [-inf, inf], "",            "Paracrystal distortion factor"], 
    126               ["radius",      "Ang",        40.0,  [0.0, inf],  "volume",      "Radius of sphere"], 
    127               ["sld",  "1e-6/Ang^2",  3.0,  [0.0, inf],  "",            "Sphere scattering length density"], 
    128               ["sld_solvent", "1e-6/Ang^2",  6.3,  [0.0, inf],  "",            "Solvent scattering length density"], 
    129               ["theta",       "degrees",     0.0,  [-inf, inf], "orientation", "Orientation of the a1 axis w/respect incoming beam"], 
    130               ["phi",         "degrees",     0.0,  [-inf, inf], "orientation", "Orientation of the a2 in the plane of the detector"], 
    131               ["psi",         "degrees",     0.0,  [-inf, inf], "orientation", "Orientation of the a3 in the plane of the detector"], 
     124parameters = [["dnn",         "Ang",       220.0, [0.0, inf],  "",            "Nearest neighbor distance"], 
     125              ["d_factor",    "",           0.06, [-inf, inf], "",            "Paracrystal distortion factor"], 
     126              ["radius",      "Ang",        40.0, [0.0, inf],  "volume",      "Radius of sphere"], 
     127              ["sld",  "1e-6/Ang^2",         3.0, [0.0, inf],  "sld",         "Sphere scattering length density"], 
     128              ["sld_solvent", "1e-6/Ang^2",  6.3, [0.0, inf],  "sld",         "Solvent scattering length density"], 
     129              ["theta",       "degrees",     0.0, [-inf, inf], "orientation", "Orientation of the a1 axis w/respect incoming beam"], 
     130              ["phi",         "degrees",     0.0, [-inf, inf], "orientation", "Orientation of the a2 in the plane of the detector"], 
     131              ["psi",         "degrees",     0.0, [-inf, inf], "orientation", "Orientation of the a3 in the plane of the detector"], 
    132132             ] 
    133133# pylint: enable=bad-whitespace, line-too-long 
  • sasmodels/models/sphere.py

    rec45c4f r42356c8  
    5858 
    5959#             ["name", "units", default, [lower, upper], "type","description"], 
    60 parameters = [["sld", "1e-6/Ang^2", 1, [-inf, inf], "", 
     60parameters = [["sld", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    6161               "Layer scattering length density"], 
    62               ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "", 
     62              ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "sld", 
    6363               "Solvent scattering length density"], 
    6464              ["radius", "Ang", 50, [0, inf], "volume", 
  • sasmodels/models/spherical_sld.py

    rc7ff92c r42356c8  
    205205              ["npts_inter",        "",               35,     [0, inf],       "", "number of points in each sublayer Must be odd number"], 
    206206              ["radius_core",       "Ang",            50.0,   [0, inf],       "volume", "intern layer thickness"], 
    207               ["sld_core",          "1e-6/Ang^2",     2.07,   [-inf, inf],    "", "sld function flat"], 
    208               ["sld_solvent",       "1e-6/Ang^2",     1.0,    [-inf, inf],    "", "sld function solvent"], 
     207              ["sld_core",          "1e-6/Ang^2",     2.07,   [-inf, inf],    "sld", "sld function flat"], 
     208              ["sld_solvent",       "1e-6/Ang^2",     1.0,    [-inf, inf],    "sld", "sld function solvent"], 
    209209              ["func_inter0",       "",               0,      [0, 4],         "", "Erf:0, RPower:1, LPower:2, RExp:3, LExp:4"], 
    210210              ["thick_inter0",      "Ang",            50.0,   [0, inf],       "volume", "intern layer thickness for core layer"], 
    211211              ["nu_inter0",         "",               2.5,    [-inf, inf],    "", "steepness parameter for core layer"], 
    212               ["sld_flat[n_shells]",      "1e-6/Ang^2",     4.06,   [-inf, inf],    "", "sld function flat"], 
     212              ["sld_flat[n_shells]",      "1e-6/Ang^2",     4.06,   [-inf, inf],    "sld", "sld function flat"], 
    213213              ["thick_flat[n_shells]",    "Ang",            100.0,  [0, inf],       "volume", "flat layer_thickness"], 
    214214              ["func_inter[n_shells]",    "",               0,      [0, 4],         "", "Erf:0, RPower:1, LPower:2, RExp:3, LExp:4"], 
  • sasmodels/models/stacked_disks.py

    rec45c4f r42356c8  
    132132    ["n_stacking",  "",            1.0, [0, inf],    "volume",      "Number of stacked layer/core/layer disks"], 
    133133    ["sigma_d",     "Ang",         0,   [0, inf],    "",            "GSD of disks sigma_d"], 
    134     ["sld_core",    "1e-6/Ang^2",  4,   [-inf, inf], "",            "Core scattering length density"], 
    135     ["sld_layer",   "1e-6/Ang^2",  0.0, [-inf, inf], "",            "Layer scattering length density"], 
    136     ["sld_solvent", "1e-6/Ang^2",  5.0, [-inf, inf], "",            "Solvent scattering length density"], 
     134    ["sld_core",    "1e-6/Ang^2",  4,   [-inf, inf], "sld",         "Core scattering length density"], 
     135    ["sld_layer",   "1e-6/Ang^2",  0.0, [-inf, inf], "sld",         "Layer scattering length density"], 
     136    ["sld_solvent", "1e-6/Ang^2",  5.0, [-inf, inf], "sld",         "Solvent scattering length density"], 
    137137    ["theta",       "degrees",     0,   [-inf, inf], "orientation", "Orientation of the stacked disk axis w/respect incoming beam"], 
    138138    ["phi",         "degrees",     0,   [-inf, inf], "orientation", "Orientation of the stacked disk in the plane of the detector"], 
  • sasmodels/models/triaxial_ellipsoid.py

    rec45c4f r42356c8  
    8686 
    8787#             ["name", "units", default, [lower, upper], "type","description"], 
    88 parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "", 
     88parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "sld", 
    8989               "Ellipsoid scattering length density"], 
    90               ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "", 
     90              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "sld", 
    9191               "Solvent scattering length density"], 
    9292              ["req_minor", "Ang", 20, [0, inf], "volume", 
  • sasmodels/models/unified_power_Rg.py

    r263daec r42356c8  
    6767parameters = [ 
    6868    ["level",     "",     1,      [0, 6], "", "Level number"], 
    69     ["Rg[level]", "Ang",  15.8,   [0, inf], "", "Radius of gyration"], 
     69    ["rg[level]", "Ang",  15.8,   [0, inf], "", "Radius of gyration"], 
    7070    ["power[level]", "",  4,      [-inf, inf], "", "Power"], 
    7171    ["B[level]",  "1/cm", 4.5e-6, [-inf, inf], "", ""], 
     
    7373    ] 
    7474 
    75 def Iq(q, level, Rg, power, B, G): 
     75def Iq(q, level, rg, power, B, G): 
    7676    ilevel = int(level) 
    7777    if ilevel == 0: 
     
    8080    result = np.zeros_like(q) 
    8181    for i in range(ilevel): 
    82         exp_now = exp(-(q*Rg[i])**2/3.) 
    83         pow_now = (erf(q*Rg[i]/sqrt(6.))**3/q)**power[i] 
    84         exp_next = exp(-(q*Rg[i+1])**2/3.) if i < ilevel-1 else 1. 
     82        exp_now = exp(-(q*rg[i])**2/3.) 
     83        pow_now = (erf(q*rg[i]/sqrt(6.))**3/q)**power[i] 
     84        exp_next = exp(-(q*rg[i+1])**2/3.) if i < ilevel-1 else 1. 
    8585        result += G[i]*exp_now + B[i]*exp_next*pow_now 
    8686    result[q==0] = np.sum(G[:ilevel]) 
     
    9090demo = dict( 
    9191    level=2, 
    92     Rg=[15.8, 21], 
     92    rg=[15.8, 21], 
    9393    power=[4, 2], 
    9494    B=[4.5e-6, 0.0006], 
  • sasmodels/models/vesicle.py

    rec45c4f r42356c8  
    8282 
    8383#             [ "name", "units", default, [lower, upper], "type", "description"], 
    84 parameters = [["sld", "1e-6/Ang^2", 0.5, [-inf, inf], "", 
     84parameters = [["sld", "1e-6/Ang^2", 0.5, [-inf, inf], "sld", 
    8585               "vesicle shell scattering length density"], 
    86               ["sld_solvent", "1e-6/Ang^2", 6.36, [-inf, inf], "", 
     86              ["sld_solvent", "1e-6/Ang^2", 6.36, [-inf, inf], "sld", 
    8787               "solvent scattering length density"], 
    8888              ["volfraction", "", 0.05, [0, 1.0], "", 
Note: See TracChangeset for help on using the changeset viewer.