Changeset 2d81cfe in sasmodels for sasmodels/models/core_shell_bicelle.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_bicelle.py (modified) (5 diffs)

sasmodels/models/core_shell_bicelle.py

@@ -50 +50 @@
     \begin{align*}
     F(Q,\alpha) = &\bigg[
-    (\rho_c - \rho_f) V_c \frac{2J_1(QRsin \alpha)}{QRsin\alpha}\frac{sin(QLcos\alpha/2)}{Q(L/2)cos\alpha} \\
-    &+(\rho_f - \rho_r) V_{c+f} \frac{2J_1(QRsin\alpha)}{QRsin\alpha}\frac{sin(Q(L/2+t_f)cos\alpha)}{Q(L/2+t_f)cos\alpha} \\
-    &+(\rho_r - \rho_s) V_t \frac{2J_1(Q(R+t_r)sin\alpha)}{Q(R+t_r)sin\alpha}\frac{sin(Q(L/2+t_f)cos\alpha)}{Q(L/2+t_f)cos\alpha}
+    (\rho_c - \rho_f) V_c
+     \frac{2J_1(QRsin \alpha)}{QRsin\alpha}
+     \frac{sin(QLcos\alpha/2)}{Q(L/2)cos\alpha} \\
+    &+(\rho_f - \rho_r) V_{c+f}
+     \frac{2J_1(QRsin\alpha)}{QRsin\alpha}
+     \frac{sin(Q(L/2+t_f)cos\alpha)}{Q(L/2+t_f)cos\alpha} \\
+    &+(\rho_r - \rho_s) V_t
+     \frac{2J_1(Q(R+t_r)sin\alpha)}{Q(R+t_r)sin\alpha}
+     \frac{sin(Q(L/2+t_f)cos\alpha)}{Q(L/2+t_f)cos\alpha}
     \bigg]
     \end{align*}
@@ -64 +70 @@
 cylinders is then given by integrating over all possible $\theta$ and $\phi$.
 
-For oriented bicelles the *theta*, and *phi* orientation parameters will appear when fitting 2D data,
-see the :ref:`cylinder` model for further information.
+For oriented bicelles the *theta*, and *phi* orientation parameters will appear
+when fitting 2D data, see the :ref:`cylinder` model for further information.
 Our implementation of the scattering kernel and the 1D scattering intensity
 use the c-library from NIST.
@@ -92 +98 @@
 """
 
+import numpy as np
 from numpy import inf, sin, cos, pi
 
@@ -149 +156 @@
 
 def random():
-    import numpy as np
     pars = dict(
         radius=10**np.random.uniform(1.3, 3),
@@ -173 +179 @@
 qx = q*cos(pi/6.0)
 qy = q*sin(pi/6.0)
-tests = [[{}, 0.05, 7.4883545957],
-        [{'theta':80., 'phi':10.}, (qx, qy), 2.81048892474 ]
-        ]
+tests = [
+    [{}, 0.05, 7.4883545957],
+    [{'theta':80., 'phi':10.}, (qx, qy), 2.81048892474]
+]
 del qx, qy  # not necessary to delete, but cleaner
-