Changeset 5d4777d in sasmodels for sasmodels/models/cylinder.py

Timestamp:

Sep 1, 2014 11:24:38 PM (10 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:

f4cf580

Parents:

ff7119b

Message:

reorganize, check and update models

File:

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

sasmodels/models/cylinder.py

@@ +1 @@
+# cylinder model
 # Note: model title and parameter table are inserted automatically
 r"""
@@ -31 +32 @@
 To provide easy access to the orientation of the cylinder, we define the
 axis of the cylinder using two angles $\theta$ and $\phi$. Those angles
-are defined in Figure :num:`figure #CylinderModel-orientation`.
+are defined in Figure :num:`figure #cylinder-orientation`.
 
-.. _CylinderModel-orientation:
+.. _cylinder-orientation:
 
 .. figure:: img/image061.JPG   (should be img/cylinder-1.jpg, or img/cylinder-orientation.jpg)
@@ -64 +65 @@
 Validation of our code was done by comparing the output of the 1D model
 to the output of the software provided by the NIST (Kline, 2006).
-Figure :num:`figure #CylinderModel-compare` shows a comparison of
+Figure :num:`figure #cylinder-compare` shows a comparison of
 the 1D output of our model and the output of the NIST software.
 
-.. _CylinderModel-compare:
+.. _cylinder-compare:
 
 .. figure:: img/image065.JPG
@@ -91 +92 @@
 the intensity for fully oriented cylinders, we can compare the result of
 averaging our 2D output using a uniform distribution $p(\theta, \phi) = 1.0$.
-Figure :num:`figure #CylinderModel-crosscheck` shows the result of
+Figure :num:`figure #cylinder-crosscheck` shows the result of
 such a cross-check.
 
-.. _CylinderModel-crosscheck:
+.. _cylinder-crosscheck:
 
 .. figure:: img/image066.JPG
@@ -111 +112 @@
 title = "Right circular cylinder with uniform scattering length density."
 description = """
-     f(q)= 2*(sldCyl - sldSolv)*V*sin(qLcos(alpha/2))
+     P(q)= 2*(sld - solvent_sld)*V*sin(qLcos(alpha/2))
             /[qLcos(alpha/2)]*J1(qRsin(alpha/2))/[qRsin(alpha)]
 
@@ -119 +120 @@
             L: Length of the cylinder
             J1: The bessel function
-            alpha: angle betweenthe axis of the
+            alpha: angle between the axis of the
             cylinder and the q-vector for 1D
             :the ouput is P(q)=scale/V*integral
             from pi/2 to zero of...
-            f(q)^(2)*sin(alpha)*dalpha+ bkg
-    """
+            f(q)^(2)*sin(alpha)*dalpha + background
+"""
 
 parameters = [
@@ -143 +144 @@
     ]
 
-source = [ "lib/J1.c", "lib/gauss76.c", "lib/cylkernel.c", "cylinder.c"]
+source = [ "lib/J1.c", "lib/gauss76.c", "cylinder.c" ]
 
 def ER(radius, length):