Changeset 3d8283b in sasmodels


Ignore:
Timestamp:
Mar 21, 2016 7:57:51 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:
3a45c2c, 02a0920
Parents:
76e5041
Message:

renamed infinitely_thin to _thin, renamed sld

Location:
sasmodels/models
Files:
1 edited
2 moved

Legend:

Unmodified
Added
Removed
  • sasmodels/models/hollow_rectangular_prism.py

    r43b7eea r3d8283b  
    8888title = "Hollow rectangular parallelepiped with uniform scattering length density." 
    8989description = """ 
    90     I(q)= scale*V*(sld - solvent_sld)^2*P(q,theta,phi)+background 
     90    I(q)= scale*V*(sld - sld_solvent)^2*P(q,theta,phi)+background 
    9191        P(q,theta,phi) = (2/pi/V^2) * double integral from 0 to pi/2 of ... 
    9292           (AP1-AP2)^2(q)*sin(theta)*dtheta*dphi 
     
    103103parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "", 
    104104               "Parallelepiped scattering length density"], 
    105               ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "", 
     105              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
    106106               "Solvent scattering length density"], 
    107107              ["a_side", "Ang", 35, [0, inf], "volume", 
     
    148148# parameters for demo 
    149149demo = dict(scale=1, background=0, 
    150             sld=6.3e-6, solvent_sld=1.0e-6, 
     150            sld=6.3e-6, sld_solvent=1.0e-6, 
    151151            a_side=35, b2a_ratio=1, c2a_ratio=1, thickness=1, 
    152152            a_side_pd=0.1, a_side_pd_n=10, 
     
    158158oldname = 'RectangularHollowPrismModel' 
    159159oldpars = dict(a_side='short_side', b2a_ratio='b2a_ratio', c_side='c2a_ratio', 
    160                thickness='thickness', sld='sldPipe', solvent_sld='sldSolv') 
     160               thickness='thickness', sld='sldPipe', sld_solvent='sldSolv') 
    161161 
    162162tests = [[{}, 0.2, 0.76687283098], 
  • sasmodels/models/hollow_rectangular_prism_thin_walls.py

    r43b7eea r3d8283b  
    7777from numpy import pi, inf, sqrt 
    7878 
    79 name = "hollow_rectangular_prism_infinitely_thin_walls" 
    80 title = "Hollow rectangular parallelepiped with infinitely thin walls." 
     79name = "hollow_rectangular_prism_thin_walls" 
     80title = "Hollow rectangular parallelepiped with thin walls." 
    8181description = """ 
    82     I(q)= scale*V*(sld - solvent_sld)^2*P(q)+background 
     82    I(q)= scale*V*(sld - sld_solvent)^2*P(q)+background 
    8383        with P(q) being the form factor corresponding to a hollow rectangular 
    8484        parallelepiped with infinitely thin walls. 
     
    8989parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "", 
    9090               "Parallelepiped scattering length density"], 
    91               ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "", 
     91              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", 
    9292               "Solvent scattering length density"], 
    9393              ["a_side", "Ang", 35, [0, inf], "volume", 
     
    9999             ] 
    100100 
    101 source = ["lib/gauss76.c", "hollow_rectangular_prism_infinitely_thin_walls.c"] 
     101source = ["lib/gauss76.c", "hollow_rectangular_prism_thin_walls.c"] 
    102102 
    103103def ER(a_side, b2a_ratio, c2a_ratio): 
     
    127127# parameters for demo 
    128128demo = dict(scale=1, background=0, 
    129             sld=6.3e-6, solvent_sld=1.0e-6, 
     129            sld=6.3e-6, sld_solvent=1.0e-6, 
    130130            a_side=35, b2a_ratio=1, c2a_ratio=1, 
    131131            a_side_pd=0.1, a_side_pd_n=10, 
     
    137137oldname = 'RectangularHollowPrismInfThinWallsModel' 
    138138oldpars = dict(a_side='short_side', b2a_ratio='b2a_ratio', c_side='c2a_ratio', 
    139                sld='sldPipe', solvent_sld='sldSolv') 
     139               sld='sldPipe', sld_solvent='sldSolv') 
    140140 
    141141tests = [[{}, 0.2, 0.837719188592], 
Note: See TracChangeset for help on using the changeset viewer.