Changeset 40a87fa in sasmodels for sasmodels/models/lamellar.py


Ignore:
Timestamp:
Aug 8, 2016 9:24:11 AM (8 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:
2472141
Parents:
2d65d51
Message:

lint and latex cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/lamellar.py

    r42356c8 r40a87fa  
    55---------- 
    66 
    7 The scattering intensity $I(q)$ for dilute, randomly oriented, "infinitely large" sheets or lamellae is 
     7The scattering intensity $I(q)$ for dilute, randomly oriented, 
     8"infinitely large" sheets or lamellae is 
    89 
    910.. math:: 
    … …  
    1920        = \frac{4\Delta\rho^2}{q^2}\sin^2\left(\frac{q\delta}{2}\right) 
    2021 
    21 where $\delta$ is the total layer thickness and $\Delta\rho$ is the scattering length density difference. 
     22where $\delta$ is the total layer thickness and $\Delta\rho$ is the 
     23scattering length density difference. 
    2224 
    23 This is the limiting form for a spherical shell of infinitely large radius. Note that the division by $\delta$ 
    24 means that $scale$ in sasview is the volume fraction of sheet, $\phi = S\delta$ where $S$ is the area of  
    25 sheet per unit volume. $S$ is half the Porod surface area per unit volume of a thicker layer (as that would  
    26 include both faces of the sheet). 
     25This is the limiting form for a spherical shell of infinitely large radius. 
     26Note that the division by $\delta$ means that $scale$ in sasview is the 
     27volume fraction of sheet, $\phi = S\delta$ where $S$ is the area of sheet 
     28per unit volume. $S$ is half the Porod surface area per unit volume of a 
     29thicker layer (as that would include both faces of the sheet). 
    2730 
    2831The 2D scattering intensity is calculated in the same way as 1D, where 
    … …  
    6063category = "shape:lamellae" 
    6164 
    62 #             ["name", "units", default, [lower, upper], "type","description"], 
    63 parameters = [ ["thickness", "Ang", 50, [0, inf], "volume","total layer thickness" ], 
    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" ], 
    66              ] 
     65# pylint: disable=bad-whitespace, line-too-long 
     66#   ["name", "units", default, [lower, upper], "type","description"], 
     67parameters = [ 
     68    ["thickness",          "Ang", 50, [0, inf],    "volume", "total layer thickness" ], 
     69    ["sld",         "1e-6/Ang^2",  1, [-inf, inf], "sld",    "Layer scattering length density" ], 
     70    ["sld_solvent", "1e-6/Ang^2",  6, [-inf, inf], "sld",    "Solvent scattering length density" ], 
     71    ] 
     72# pylint: enable=bad-whitespace, line-too-long 
    6773 
    6874# No volume normalization despite having a volume parameter 
    … …  
    9197            thickness_pd=0.2, thickness_pd_n=40) 
    9298tests = [ 
    93         [ {'scale': 1.0, 'background' : 0.0, 'thickness' : 50.0, 'sld' : 1.0,'sld_solvent' : 6.3, 'thickness_pd' : 0.0,  
    94            }, [0.001], [882289.54309]] 
     99        [ {'scale': 1.0, 'background': 0.0, 'thickness': 50.0, 
     100           'sld': 1.0, 'sld_solvent': 6.3, 'thickness_pd': 0.0}, 
     101          [0.001], [882289.54309]] 
    95102        ] 
    96103# ADDED by: converted by PAK? (or RKH?)     ON: 16Mar2016 - RKH adding unit tests from sasview to early 2015 conversion 
Note: See TracChangeset for help on using the changeset viewer.