Changeset 0d6e865 in sasmodels for sasmodels/models/cylinder.py

Timestamp:

Oct 11, 2016 11:42:00 AM (8 years ago)

Author:

dirk

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

1fdb555

Parents:

19e7ca7

Message:

Rewriting selected models in spherical coordinates. This fixes ticket #492 for these models.

File:

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

sasmodels/models/cylinder.py

@@ -35 +35 @@
 .. math::
 
-    F^2(q)=\int_{0}^{\pi/2}{F^2(q,\alpha)\sin(\alpha)d\alpha}
+    F^2(q)=\int_{0}^{\pi/2}{F^2(q,\theta)\sin(\theta)d\theta}
 
 
@@ -48 +48 @@
     Definition of the angles for oriented cylinders.
 
-.. figure:: img/cylinder_angle_projection.jpg
-
-    Examples of the angles for oriented cylinders against the detector plane.
 
 NB: The 2nd virial coefficient of the cylinder is calculated based on the
@@ -77 +74 @@
 
     P(q) = \int_0^{\pi/2} d\phi
-        \int_0^\pi p(\theta, \phi) P_0(q,\alpha) \sin \theta\ d\theta
+        \int_0^\pi p(\alpha) P_0(q,\alpha) \sin \alpha\ d\alpha
 
 
-where $p(\theta,\phi)$ is the probability distribution for the orientation
+where $p(\theta,\phi) = 1$ is the probability distribution for the orientation
 and $P_0(q,\alpha)$ is the scattering intensity for the fully oriented
 system, and then comparing to the 1D result.
@@ -87 +84 @@
 ----------
 
-None
-
+J. S. Pedersen, Adv. Colloid Interface Sci. 70, 171-210 (1997).
+G. Fournet, Bull. Soc. Fr. Mineral. Cristallogr. 74, 39-113 (1951).
 """
 
@@ -123 +120 @@
                "Cylinder length"],
               ["theta", "degrees", 60, [-inf, inf], "orientation",
-               "In plane angle"],
+               "latitude"],
               ["phi", "degrees", 60, [-inf, inf], "orientation",
-               "Out of plane angle"],
+               "longitude"],
              ]
 
-source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "cylinder.c"]
+source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c",  "cylinder.c"]
 
 def ER(radius, length):
@@ -148 +145 @@
 
 qx, qy = 0.2 * np.cos(2.5), 0.2 * np.sin(2.5)
-tests = [[{}, 0.2, 0.042761386790780453],
-         [{}, [0.2], [0.042761386790780453]],
-         [{'theta':10.0, 'phi':10.0}, (qx, qy), 0.03514647218513852],
-         [{'theta':10.0, 'phi':10.0}, [(qx, qy)], [0.03514647218513852]],
-        ]
+# After redefinition of angles, find new tests values 
+#tests = [[{}, 0.2, 0.042761386790780453],
+#         [{}, [0.2], [0.042761386790780453]],
+#         [{'theta':10.0, 'phi':10.0}, (qx, qy), 0.03514647218513852],
+#         [{'theta':10.0, 'phi':10.0}, [(qx, qy)], [0.03514647218513852]],
+#        ]
 del qx, qy  # not necessary to delete, but cleaner
 # ADDED by:  RKH  ON: 18Mar2016 renamed sld's etc