Changeset b297ba9 in sasmodels for sasmodels/models/rectangular_prism.py

Timestamp:

Mar 20, 2019 7:03:50 PM (5 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:

4e28511

Parents:

0d362b7

Message:

lint

File:

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

sasmodels/models/rectangular_prism.py

@@ -32 +32 @@
 .. math::
 
-  A_P\,(q) =
+    A_P\,(q) =
       \frac{\sin \left( \tfrac{1}{2}qC \cos\theta \right) }{\tfrac{1}{2} qC \cos\theta}
       \,\times\,
@@ -48 +48 @@
 
 .. math::
-  P(q) =  \frac{2}{\pi} \int_0^{\frac{\pi}{2}} \,
-  \int_0^{\frac{\pi}{2}} A_P^2(q) \, \sin\theta \, d\theta \, d\phi
+    P(q) =  \frac{2}{\pi} \int_0^{\frac{\pi}{2}} \,
+    \int_0^{\frac{\pi}{2}} A_P^2(q) \, \sin\theta \, d\theta \, d\phi
 
 And the 1D scattering intensity is calculated as
 
 .. math::
-  I(q) = \text{scale} \times V \times (\rho_\text{p} -
-  \rho_\text{solvent})^2 \times P(q)
+    I(q) = \text{scale} \times V \times (\rho_\text{p} -
+    \rho_\text{solvent})^2 \times P(q)
 
 where $V$ is the volume of the rectangular prism, $\rho_\text{p}$
@@ -100 +100 @@
 R Nayuk and K Huber, *Z. Phys. Chem.*, 226 (2012) 837-854
 
-L. Onsager, Ann. New York Acad. Sci. 51, 627-659 (1949). 
+L. Onsager, Ann. New York Acad. Sci. 51, 627-659 (1949).
 
 """
 
 import numpy as np
-from numpy import pi, inf, sqrt
+from numpy import inf
 
 name = "rectangular_prism"
@@ -140 +140 @@
 have_Fq = True
 effective_radius_type = [
-    "equivalent cylinder excluded volume", "equivalent volume sphere", 
+    "equivalent cylinder excluded volume", "equivalent volume sphere",
     "half length_a", "half length_b", "half length_c",
     "equivalent circular cross-section", "half ab diagonal", "half diagonal",
@@ -146 +146 @@
 
 def random():
+    """Return a random parameter set for the model."""
     a, b, c = 10**np.random.uniform(1, 4.7, size=3)
     pars = dict(