Changeset 01eece6 in sasmodels for sasmodels/models/cylinder.py

Timestamp:

Mar 19, 2016 5:24:04 AM (8 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:

787be86

Parents:

f3d7abd

Message:

renamed params, checked docs, some cylinder models

File:

• sasmodels/models/cylinder.py (modified) (7 diffs)

sasmodels/models/cylinder.py

@@ -2 +2 @@
 # Note: model title and parameter table are inserted automatically
 r"""
-The form factor is normalized by the particle volume.
+The form factor is normalized by the particle volume V = \piR^2L.
 
 Definition
@@ -19 +19 @@
 
     F(q) = 2 (\Delta \rho) V
-           \frac{\sin \left(q\tfrac12 L\cos\alpha \right)}
-                {q\tfrac12 L \cos \alpha}
+           \frac{\sin \left(\tfrac12 qL\cos\alpha \right)}
+                {\tfrac12 qL \cos \alpha}
            \frac{J_1 \left(q R \sin \alpha\right)}{q R \sin \alpha}
 
@@ -88 +88 @@
 title = "Right circular cylinder with uniform scattering length density."
 description = """
-     f(q,alpha) = 2*(sld - solvent_sld)*V*sin(qLcos(alpha/2))
-                /[qLcos(alpha/2)]*J1(qRsin(alpha/2))/[qRsin(alpha)]
+     f(q,alpha) = 2*(sld - sld_solvent)*V*sin(qLcos(alpha)/2))
+                /[qLcos(alpha)/2]*J1(qRsin(alpha))/[qRsin(alpha)]
 
             P(q,alpha)= scale/V*f(q,alpha)^(2)+background
@@ -107 +107 @@
 parameters = [["sld", "4e-6/Ang^2", 4, [-inf, inf], "",
                "Cylinder 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"],
               ["radius", "Ang", 20, [0, inf], "volume",
@@ -130 +130 @@
 # parameters for demo
 demo = dict(scale=1, background=0,
-            sld=6, solvent_sld=1,
+            sld=6, sld_solvent=1,
             radius=20, length=300,
             theta=60, phi=60,
@@ -141 +141 @@
 # names and the target sasview model name.
 oldname = 'CylinderModel'
-oldpars = dict(theta='cyl_theta', phi='cyl_phi', sld='sldCyl', solvent_sld='sldSolv')
+oldpars = dict(theta='cyl_theta', phi='cyl_phi', sld='sldCyl', sld_solvent='sldSolv')
 
 
@@ -151 +151 @@
         ]
 del qx, qy  # not necessary to delete, but cleaner
+# ADDED by:  RKH  ON: 18Mar2016 renamed sld's etc