Changeset b7c2fce in sasmodels

Timestamp:

Feb 17, 2016 3:02:54 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

19b6d28

Parents:

c612162

Message:

Fix pylint and add clarity to description.

File:

• sasmodels/models/elliptical_cylinder.py (modified) (3 diffs)

sasmodels/models/elliptical_cylinder.py

@@ -22 +22 @@
 
 .. math::
-    F(\mathbf{q},\alpha,\psi)=2\frac{J_1(a)\sin(b)}{ab} 
+    F(\mathbf{q},\alpha,\psi)=2\frac{J_1(a)\sin(b)}{ab}
     \\
     a = \mathbf{q}\sin(\alpha)\left[ r^2_{major}\sin^2(\psi)+r^2_{minor}\cos(\psi) \right]^{1/2}
@@ -28 +28 @@
     b=\mathbf{q}\frac{L}{2}\cos(\alpha)
 
-and the angle |bigpsi| is defined as the orientation of the major axis of the ellipse with respect to the vector *q*\ .
+and the angle |bigpsi| is defined as the orientation of the major axis of the ellipse with respect to the vector $\vec q$ .
+The angle $\alpha$ is the angle between the axis of the cylinder and $\vec q$.
 
 
@@ -129 +130 @@
         @param length: Length of the cylinder
     """
-    r = math.sqrt(r_minor * r_minor * r_ratio)
-    ddd = 0.75 * r * (2 * r * length + (length + r) * (length + pi * r))
+    radius = math.sqrt(r_minor * r_minor * r_ratio)
+    ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius))
     return 0.5 * (ddd) ** (1. / 3.)