Changes in sasmodels/models/core_shell_parallelepiped.py [5810f00:92dfe0c] in sasmodels

File:

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

sasmodels/models/core_shell_parallelepiped.py

@@ -44 +44 @@
 
     F_{a}(Q,\alpha,\beta)=
-    \Bigg(\frac{sin(Q(L_A+2t_A)/2sin\alpha sin\beta)}{Q(L_A+2t_A)/2sin\alpha
-    sin\beta)}
-    - \frac{sin(QL_A/2sin\alpha sin\beta)}{QL_A/2sin\alpha sin\beta)} \Bigg)
-    + \frac{sin(QL_B/2sin\alpha sin\beta)}{QL_B/2sin\alpha sin\beta)}
-    + \frac{sin(QL_C/2sin\alpha sin\beta)}{QL_C/2sin\alpha sin\beta)}
+    \left[\frac{\sin(Q(L_A+2t_A)/2\sin\alpha \sin\beta)}{Q(L_A+2t_A)/2\sin\alpha\sin\beta}
+    - \frac{\sin(QL_A/2\sin\alpha \sin\beta)}{QL_A/2\sin\alpha \sin\beta} \right]
+    \left[\frac{\sin(QL_B/2\sin\alpha \sin\beta)}{QL_B/2\sin\alpha \sin\beta} \right]
+    \left[\frac{\sin(QL_C/2\sin\alpha \sin\beta)}{QL_C/2\sin\alpha \sin\beta} \right]
 
 .. note::
@@ -58 +57 @@
 
 FITTING NOTES
-If the scale is set equal to the particle volume fraction, |phi|, the returned
+If the scale is set equal to the particle volume fraction, $\phi$, the returned
 value is the scattered intensity per unit volume, $I(q) = \phi P(q)$.
 However, **no interparticle interference effects are included in this
@@ -178 +177 @@
 # parameters for demo
 demo = dict(scale=1, background=0.0,
-            sld_core=1e-6, sld_a=2e-6, sld_b=4e-6,
-            sld_c=2e-6, sld_solvent=6e-6,
+            sld_core=1, sld_a=2, sld_b=4, sld_c=2, sld_solvent=6,
             length_a=35, length_b=75, length_c=400,
             thick_rim_a=10, thick_rim_b=10, thick_rim_c=10,
@@ -191 +189 @@
             theta_pd=10, theta_pd_n=1,
             phi_pd=10, phi_pd_n=1,
-            psi_pd=10, psi_pd_n=10)
+            psi_pd=10, psi_pd_n=1)
 
 qx, qy = 0.2 * np.cos(2.5), 0.2 * np.sin(2.5)