Changeset 40a87fa in sasmodels for sasmodels/models/raspberry.py

Timestamp:

Aug 8, 2016 9:24:11 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2472141

Parents:

2d65d51

Message:

lint and latex cleanup

File:

• sasmodels/models/raspberry.py (modified) (7 diffs)

sasmodels/models/raspberry.py

@@ -22 +22 @@
 .. math::
 
-    S(q) = \frac{sin(qR_1)}{qR_1}\frac{sin(qR_2)}{qR_2}\frac{sin(qr)}{qr}
+    S(q) = \frac{\sin(qR_1)}{qR_1}\frac{\sin(qR_2)}{qR_2}\frac{\sin(qr)}{qr}
 
 In this case, the large droplet and small particles are solid spheres rather
@@ -31 +31 @@
 .. math::
 
-    \Psi_L = \int_0^{R_L}(4\pi R^2_L)\frac{sin(qR_L)}{qR_L}dR_L = 
-    \frac{3[sin(qR_L)-qR_Lcos(qR_L)]}{(qR_L)^2}
+    \Psi_L = \int_0^{R_L}(4\pi R^2_L)\frac{\sin(qR_L)}{qR_L}dR_L =
+    \frac{3[\sin(qR_L)-qR_L\cos(qR_L)]}{(qR_L)^2}
 
 .. math::
 
-    \Psi_S = \int_0^{R_S}(4\pi R^2_S)\frac{sin(qR_S)}{qR_S}dR_S =
-    \frac{3[sin(qR_S)-qR_Lcos(qR_S)]}{(qR_S)^2}
+    \Psi_S = \int_0^{R_S}(4\pi R^2_S)\frac{\sin(qR_S)}{qR_S}dR_S =
+    \frac{3[\sin(qR_S)-qR_L\cos(qR_S)]}{(qR_S)^2}
 
 The cross term between the large droplet and small particles is given by:
 
 .. math::
-    S_{LS} = \Psi_L\Psi_S\frac{sin(q(R_L+\delta R_S))}{q(R_L+\delta\ R_S)}
+    S_{LS} = \Psi_L\Psi_S\frac{\sin(q(R_L+\delta R_S))}{q(R_L+\delta\ R_S)}
 
 and the self term between small particles is given by:
 
 .. math::
-    S_{SS} = \Psi_S^2\biggl[\frac{sin(q(R_L+\delta R_S))}{q(R_L+\delta\ R_S)}
+    S_{SS} = \Psi_S^2\biggl[\frac{\sin(q(R_L+\delta R_S))}{q(R_L+\delta\ R_S)}
     \biggr]^2
 
@@ -54 +54 @@
 .. math::
 
-    N_p = \frac{\phi_S\phi_{surface}V_L}{\phi_L V_S}
+    N_p = \frac{\phi_S\phi_\text{surface}V_L}{\phi_L V_S}
 
 where $\phi_S$ is the volume fraction of small particles in the sample,
-$\phi_{surface}$ is the fraction of the small particles that are adsorbed to
-the large droplets, $\phi_L$ is the volume fraction of large droplets in the
+$\phi_\text{surface}$ is the fraction of the small particles that are adsorbed
+to the large droplets, $\phi_L$ is the volume fraction of large droplets in the
 sample, and $V_S$ and $V_L$ are the volumes of individual small particles and
 large droplets respectively.
@@ -64 +64 @@
 The form factor of the entire complex can now be calculated including the excess
 scattering length densities of the components $\Delta\rho_L$ and $\Delta\rho_S$,
-where $\Delta\rho_x = |\rho_x-\rho_{solvent}|$ :
+where $\Delta\rho_x = \left|\rho_x-\rho_\text{solvent}\right|$ :
 
 .. math::
@@ -83 +83 @@
 
 .. math::
-    I(Q) = I_{LS}(Q) + I_S(Q) = (\phi_L(\Delta\rho_L)^2V_L + 
-            \phi_S\phi_{surface}N_p(\Delta\rho_S)^2V_S)P_{LS}
-            + \phi_S(1-\phi_{surface})(\Delta\rho_S)^2V_S\Psi_S^2
+    I(Q) = I_{LS}(Q) + I_S(Q) = (\phi_L(\Delta\rho_L)^2V_L +
+            \phi_S\phi_\text{surface}N_p(\Delta\rho_S)^2V_S)P_{LS}
+            + \phi_S(1-\phi_\text{surface})(\Delta\rho_S)^2V_S\Psi_S^2
 
 A useful parameter to extract is the fraction of the surface area of the large
@@ -92 +92 @@
 
 .. math::
-    \chi = \frac{4\phi_L\phi_{surface}(R_L+\delta R_S)}{\phi_LR_S}
+    \chi = \frac{4\phi_L\phi_\text{surface}(R_L+\delta R_S)}{\phi_LR_S}
 
 
@@ -109 +109 @@
 """
 
-from numpy import pi, inf
+from numpy import inf
 
 name = "raspberry"