Changeset 2d81cfe in sasmodels for sasmodels/models/core_shell_parallelepiped.py

Timestamp:

Nov 29, 2017 11:13:23 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

237b800f

Parents:

a839b22

Message:

lint

File:

• sasmodels/models/core_shell_parallelepiped.py (modified) (5 diffs)

sasmodels/models/core_shell_parallelepiped.py

@@ -5 +5 @@
 Calculates the form factor for a rectangular solid with a core-shell structure.
 The thickness and the scattering length density of the shell or
-"rim" can be different on each (pair) of faces. However at this time
-the 1D calculation does **NOT** actually calculate a c face rim despite the presence of
-the parameter. Some other aspects of the 1D calculation may be wrong.
+"rim" can be different on each (pair) of faces. However at this time the 1D
+calculation does **NOT** actually calculate a c face rim despite the presence
+of the parameter. Some other aspects of the 1D calculation may be wrong.
 
 .. note::
@@ -51 +51 @@
 
     F_{a}(Q,\alpha,\beta)=
-    \left[\frac{\sin(\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha \sin\beta)}{\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha\sin\beta}
-    - \frac{\sin(\tfrac{1}{2}QL_A\sin\alpha \sin\beta)}{\tfrac{1}{2}QL_A\sin\alpha \sin\beta} \right]
-    \left[\frac{\sin(\tfrac{1}{2}QL_B\sin\alpha \sin\beta)}{\tfrac{1}{2}QL_B\sin\alpha \sin\beta} \right]
-    \left[\frac{\sin(\tfrac{1}{2}QL_C\sin\alpha \sin\beta)}{\tfrac{1}{2}QL_C\sin\alpha \sin\beta} \right]
+    \left[\frac{\sin(\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha \sin\beta)
+               }{\tfrac{1}{2}Q(L_A+2t_A)\sin\alpha\sin\beta}
+    - \frac{\sin(\tfrac{1}{2}QL_A\sin\alpha \sin\beta)
+           }{\tfrac{1}{2}QL_A\sin\alpha \sin\beta} \right]
+    \left[\frac{\sin(\tfrac{1}{2}QL_B\sin\alpha \sin\beta)
+               }{\tfrac{1}{2}QL_B\sin\alpha \sin\beta} \right]
+    \left[\frac{\sin(\tfrac{1}{2}QL_C\sin\alpha \sin\beta)
+               }{\tfrac{1}{2}QL_C\sin\alpha \sin\beta} \right]
 
 .. note::
@@ -94 +98 @@
 
     Definition of the angles for oriented core-shell parallelepipeds.
-    Note that rotation $\theta$, initially in the $xz$ plane, is carried out first, then
-    rotation $\phi$ about the $z$ axis, finally rotation $\Psi$ is now around the axis of the cylinder.
-    The neutron or X-ray beam is along the $z$ axis.
+    Note that rotation $\theta$, initially in the $xz$ plane, is carried
+    out first, then rotation $\phi$ about the $z$ axis, finally rotation
+    $\Psi$ is now around the axis of the cylinder. The neutron or X-ray
+    beam is along the $z$ axis.
 
 .. figure:: img/parallelepiped_angle_projection.png
@@ -182 +187 @@
 
 def random():
-    import numpy as np
     outer = 10**np.random.uniform(1, 4.7, size=3)
     thick = np.random.beta(0.5, 0.5, size=3)*(outer-2) + 1
@@ -216 +220 @@
     qx, qy = 0.2 * cos(pi/6.), 0.2 * sin(pi/6.)
     tests = [[{}, 0.2, 0.533149288477],
-            [{}, [0.2], [0.533149288477]],
-            [{'theta':10.0, 'phi':20.0}, (qx, qy), 0.0853299803222],
-            [{'theta':10.0, 'phi':20.0}, [(qx, qy)], [0.0853299803222]],
+             [{}, [0.2], [0.533149288477]],
+             [{'theta':10.0, 'phi':20.0}, (qx, qy), 0.0853299803222],
+             [{'theta':10.0, 'phi':20.0}, [(qx, qy)], [0.0853299803222]],
             ]
     del qx, qy  # not necessary to delete, but cleaner