Changeset 76e5041 in sasmodels

Timestamp:

Mar 21, 2016 7:07:41 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:

3d8283b

Parents:

8e0d974

Message:

renamed sld, added a ref

Location:

sasmodels/models

Files:

• parallelepiped.py (modified) (5 diffs)
• rectangular_prism.py (modified) (5 diffs)

sasmodels/models/parallelepiped.py

@@ -151 +151 @@
 ----------
 
-None.
+P Mittelbach and G Porod, *Acta Physica Austriaca*, 14 (1961) 185-211
+
+R Nayuk and K Huber, *Z. Phys. Chem.*, 226 (2012) 837-854
 """
 
@@ -160 +162 @@
 title = "Rectangular parallelepiped with uniform scattering length density."
 description = """
-    I(q)= scale*V*(sld - solvent_sld)^2*P(q,alpha)+background
+    I(q)= scale*V*(sld - sld_solvent)^2*P(q,alpha)+background
         P(q,alpha) = integral from 0 to 1 of ...
            phi(mu*sqrt(1-sigma^2),a) * S(mu*c*sigma/2)^2 * dsigma
@@ -177 +179 @@
 parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "",
                "Parallelepiped scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "",
+              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "",
                "Solvent scattering length density"],
               ["a_side", "Ang", 35, [0, inf], "volume",
@@ -210 +212 @@
 # parameters for demo
 demo = dict(scale=1, background=0,
-            sld=6.3e-6, solvent_sld=1.0e-6,
+            sld=6.3e-6, sld_solvent=1.0e-6,
             a_side=35, b_side=75, c_side=400,
             theta=45, phi=30, psi=15,
@@ -225 +227 @@
 oldpars = dict(theta='parallel_theta', phi='parallel_phi', psi='parallel_psi',
                a_side='short_a', b_side='short_b', c_side='long_c',
-               sld='sldPipe', solvent_sld='sldSolv')
+               sld='sldPipe', sld_solvent='sldSolv')
 
 

sasmodels/models/rectangular_prism.py

@@ -9 +9 @@
 The only difference is that the way the relevant
 parameters are defined here (*a*, *b/a*, *c/a* instead of *a*, *b*, *c*)
-allows to use polydispersity with this model while keeping the shape of
+which allows use of polydispersity with this model while keeping the shape of
 the prism (e.g. setting *b/a* = 1 and *c/a* = 1 and applying polydispersity
 to *a* will generate a distribution of cubes of different sizes).
@@ -86 +86 @@
 title = "Rectangular parallelepiped with uniform scattering length density."
 description = """
-    I(q)= scale*V*(sld - solvent_sld)^2*P(q,theta,phi)+background
+    I(q)= scale*V*(sld - sld_solvent)^2*P(q,theta,phi)+background
         P(q,theta,phi) = (2/pi) * double integral from 0 to pi/2 of ...
            AP^2(q)*sin(theta)*dtheta*dphi
@@ -97 +97 @@
 parameters = [["sld", "1e-6/Ang^2", 6.3, [-inf, inf], "",
                "Parallelepiped scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "",
+              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "",
                "Solvent scattering length density"],
               ["a_side", "Ang", 35, [0, inf], "volume",
@@ -125 +125 @@
 # parameters for demo
 demo = dict(scale=1, background=0,
-            sld=6.3e-6, solvent_sld=1.0e-6,
+            sld=6.3e-6, sld_solvent=1.0e-6,
             a_side=35, b2a_ratio=1, c2a_ratio=1,
             a_side_pd=0.1, a_side_pd_n=10,
@@ -135 +135 @@
 oldname = 'RectangularPrismModel'
 oldpars = dict(a_side='short_side', b2a_ratio='b2a_ratio', c_side='c2a_ratio',
-               sld='sldPipe', solvent_sld='sldSolv')
+               sld='sldPipe', sld_solvent='sldSolv')
 
 tests = [[{}, 0.2, 0.375248406825],