Changeset fcb33e4 in sasmodels for sasmodels/models/elliptical_cylinder.py

Timestamp:

Jan 4, 2017 8:09:53 AM (7 years ago)

Author:

richardh

Branches:

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

Children:

473a9f1, b7e8b94

Parents:

64614ad

Message:

new model core_shell_bicelle_elliptical, not tested for 2d, docu changes for other cylinder models

File:

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

sasmodels/models/elliptical_cylinder.py

@@ -20 +20 @@
 
     I(\vec q)=\frac{1}{V_\text{cyl}}\int{d\psi}\int{d\phi}\int{
-        p(\theta,\phi,\psi)F^2(\vec q,\alpha,\psi)\sin(\theta)d\theta}
+        p(\theta,\phi,\psi)F^2(\vec q,\alpha,\psi)\sin(\alpha)d\alpha}
 
 with the functions
@@ -26 +26 @@
 .. math::
 
-    F(\vec q,\alpha,\psi) = 2\frac{J_1(a)\sin(b)}{ab}
+    F(q,\alpha,\psi) = 2\frac{J_1(a)\sin(b)}{ab}
 
 where
@@ -32 +32 @@
 .. math::
 
-    a &= \vec q\sin(\alpha)\left[
-        r^2_\text{major}\sin^2(\psi)+r^2_\text{minor}\cos(\psi) \right]^{1/2}
+    a = qr'\sin(\alpha)
+    
+    b = q\frac{L}{2}\cos(\alpha)
+    
+    r'=\frac{r_{minor}}{\sqrt{2}}\sqrt{(1+\nu^{2}) + (1-\nu^{2})cos(\psi)}
 
-    b &= \vec q\frac{L}{2}\cos(\alpha)
 
-and the angle $\Psi$ is defined as the orientation of the major axis of the
+and the angle $\psi$ 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$.
@@ -95 +97 @@
 
 L A Feigin and D I Svergun, *Structure Analysis by Small-Angle X-Ray and
-Neutron Scattering*, Plenum, New York, (1987)
+Neutron Scattering*, Plenum, New York, (1987) [see table 3.4]
+
+Authorship and Verification
+----------------------------
+
+* **Author:**
+* **Last Modified by:** 
+* **Last Reviewed by:**  Richard Heenan - corrected equation in docs **Date:** December 21, 2016
+
 """