Changeset 0e55afe in sasmodels for sasmodels/models/core_shell_parallelepiped.py

Timestamp:

Nov 29, 2017 8:55:21 PM (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:

4493288

Parents:

688d315 (diff), b669b49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-786

File:

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

sasmodels/models/core_shell_parallelepiped.py

@@ -7 +7 @@
 "rim" can be different on each (pair) of faces.
 
-
 The form factor is normalized by the particle volume $V$ such that
 
@@ -16 +15 @@
 where $\langle \ldots \rangle$ is an average over all possible orientations
 of the rectangular solid.
-
 
 The function calculated is the form factor of the rectangular solid below.
@@ -96 +94 @@
 
     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 parallelepiped.
-    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
@@ -184 +183 @@
 
 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
@@ -218 +216 @@
     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