Changeset 02a0920 in sasmodels


Ignore:
Timestamp:
Mar 21, 2016 8:37:52 AM (9 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:
728136f
Parents:
3d8283b
Message:

renamed sc_crystal to sc_paracrystal, fcc and bcc.py to fcc_paracrystal etc, renamed sld

Location:
sasmodels/models
Files:
1 edited
6 moved

Legend:

Unmodified
Added
Removed

  • sasmodels/models/barbell.py

    r26141cb r02a0920  
    101101# pylint: disable=bad-whitespace, line-too-long 
    102102#             ["name", "units", default, [lower, upper], "type","description"], 
    103 parameters = [["sld",         "4e-6/Ang^2",   4, [-inf, inf], "",            "Barbell scattering length density"], 
    104               ["solvent_sld", "1e-6/Ang^2",   1, [-inf, inf], "",            "Solvent scattering length density"], 
     103parameters = [["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"], 
    105105              ["bell_radius", "Ang",         40, [0, inf],    "volume",      "Spherical bell radius"], 
    106106              ["radius",      "Ang",         20, [0, inf],    "volume",      "Cylindrical bar radius"], 
    … …  
    115115# parameters for demo 
    116116demo = dict(scale=1, background=0, 
    117             sld=6, solvent_sld=1, 
     117            sld=6, sld_solvent=1, 
    118118            bell_radius=40, radius=20, length=400, 
    119119            theta=60, phi=60, 
    … …  
    128128oldname = 'BarBellModel' 
    129129oldpars = dict(sld='sld_barbell', 
    130                solvent_sld='sld_solv', bell_radius='rad_bell', 
     130               sld_solvent='sld_solv', bell_radius='rad_bell', 
    131131               radius='rad_bar', length='len_bar') 

  • sasmodels/models/bcc_paracrystal.py

    r43b7eea r02a0920  
    117117              ["radius",      "Ang",        40,    [0, inf],    "volume",      "Particle radius"], 
    118118              ["sld",         "1e-6/Ang^2",  4,    [-inf, inf], "",            "Particle scattering length density"], 
    119               ["solvent_sld", "1e-6/Ang^2",  1,    [-inf, inf], "",            "Solvent scattering length density"], 
     119              ["sld_solvent", "1e-6/Ang^2",  1,    [-inf, inf], "",            "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"], 
    … …  
    124124# pylint: enable=bad-whitespace, line-too-long 
    125125 
    126 source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "bcc.c"] 
     126source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "bcc_paracrystal_kernel.c"] 
    127127 
    128128# parameters for demo 
    129129demo = dict( 
    130130    scale=1, background=0, 
    131     dnn=220, d_factor=0.06, sld=4, solvent_sld=1, 
     131    dnn=220, d_factor=0.06, sld=4, sld_solvent=1, 
    132132    radius=40, 
    133133    theta=60, phi=60, psi=60, 
    … …  
    141141# names and the target sasview model name. 
    142142oldname = 'BCCrystalModel' 
    143 oldpars = dict(sld='sldSph', solvent_sld='sldSolv') 
     143oldpars = dict(sld='sldSph', sld_solvent='sldSolv') 

  • sasmodels/models/fcc_paracrystal.py

    r43b7eea r02a0920  
    109109              ["radius", "Ang", 40, [0, inf], "volume", "Particle radius"], 
    110110              ["sld", "1e-6/Ang^2", 4, [-inf, inf], "", "Particle scattering length density"], 
    111               ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "", "Solvent scattering length density"], 
     111              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", "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"], 
    … …  
    116116# pylint: enable=bad-whitespace, line-too-long 
    117117 
    118 source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "fcc.c"] 
     118source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "fcc_paracrystal_kernel.c"] 
    119119 
    120120# parameters for demo 
    121121demo = dict(scale=1, background=0, 
    122             dnn=220, d_factor=0.06, sld=4, solvent_sld=1, 
     122            dnn=220, d_factor=0.06, sld=4, sld_solvent=1, 
    123123            radius=40, 
    124124            theta=60, phi=60, psi=60, 
    … …  
    132132# names and the target sasview model name. 
    133133oldname = 'FCCrystalModel' 
    134 oldpars = dict(sld='sldSph', solvent_sld='sldSolv') 
     134oldpars = dict(sld='sldSph', sld_solvent='sldSolv') 

  • sasmodels/models/sc_paracrystal.py

    ra84a0ca r02a0920  
    9797from numpy import inf 
    9898 
    99 name = "sc_crystal" 
     99name = "sc_paracrystal" 
    100100title = "Simple cubic lattice with paracrystalline distortion" 
    101101description = """ 
    … …  
    125125              ["d_factor",    "",            0.06, [-inf, inf], "",            "Paracrystal distortion factor"], 
    126126              ["radius",      "Ang",        40.0,  [0.0, inf],  "volume",      "Radius of sphere"], 
    127               ["sphere_sld",  "1e-6/Ang^2",  3.0,  [0.0, inf],  "",            "Sphere scattering length density"], 
    128               ["solvent_sld", "1e-6/Ang^2",  6.3,  [0.0, inf],  "",            "Solvent scattering length density"], 
     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"], 
    129129              ["theta",       "degrees",     0.0,  [-inf, inf], "orientation", "Orientation of the a1 axis w/respect incoming beam"], 
    130130              ["phi",         "degrees",     0.0,  [-inf, inf], "orientation", "Orientation of the a2 in the plane of the detector"], 
    … …  
    133133# pylint: enable=bad-whitespace, line-too-long 
    134134 
    135 source = ["lib/sph_j1c.c", "lib/sphere_form.c", "lib/gauss150.c", "sc_crystal.c"] 
     135source = ["lib/sph_j1c.c", "lib/sphere_form.c", "lib/gauss150.c", "sc_paracrystal_kernel.c"] 
    136136 
    137137demo = dict(scale=1, background=0, 
    … …  
    139139            d_factor=0.06, 
    140140            radius=40.0, 
    141             sphere_sld=3.0, 
    142             solvent_sld=6.3, 
     141            sld=3.0, 
     142            sld_solvent=6.3, 
    143143            theta=0.0, 
    144144            phi=0.0, 
    … …  
    147147oldname = 'SCCrystalModel' 
    148148 
    149 oldpars = dict(sphere_sld='sldSph', 
    150                solvent_sld='sldSolv') 
     149oldpars = dict(sld='sldSph', 
     150               sld_solvent='sldSolv') 
    151151 
    152152tests = [ 
Note: See TracChangeset for help on using the changeset viewer.