Changeset 416f5c7 in sasmodels for sasmodels/models/core_shell_bicelle.py

Timestamp:

Oct 7, 2016 3:51:36 PM (8 years ago)

Author:

richardh

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

5df888c

Parents:

8749c1c4

Message:

fixes for numref warnings in docu, new equations core_shell_bicelle core_shell_ellipsoid

File:

• sasmodels/models/core_shell_bicelle.py (modified) (2 diffs)

sasmodels/models/core_shell_bicelle.py

@@ -42 +42 @@
     I(Q,\alpha) = \frac{\text{scale}}{V} \cdot
         F(Q,\alpha)^2 + \text{background}
+
 where
 
 .. math::
 
-    \begin{align}    
-    F(Q,\alpha) = &\frac{1}{V_t} \bigg[ 
-    (\rho_c - \rho_f) V_c \frac{J_1(QRsin \alpha)}{QRsin\alpha}\frac{2 \cdot QLcos\alpha}{QLcos\alpha} \\
-    &+(\rho_f - \rho_r) V_{c+f} \frac{J_1(QRsin\alpha)}{QRsin\alpha}\frac{2 \cdot Q(L+t_f)cos\alpha}{Q(L+t_f)cos\alpha} \\
-    &+(\rho_r - \rho_s) V_t \frac{J_1(Q(R+t_r)sin\alpha)}{Q(R+t_r)sin\alpha}\frac{2 \cdot Q(L+t_f)cos\alpha}{Q(L+t_f)cos\alpha}
+        \begin{align}    
+    F(Q,\alpha) = &\bigg[ 
+    (\rho_c - \rho_f) V_c \frac{J_1(QRsin \alpha)}{QRsin\alpha}\frac{2 \cdot sin(QLcos\alpha/2)}{QLcos\alpha} \\
+    &+(\rho_f - \rho_r) V_{c+f} \frac{J_1(QRsin\alpha)}{QRsin\alpha}\frac{2 \cdot sin(Q(L/2+t_f)cos\alpha)}{Q(L+2t_f)cos\alpha} \\
+    &+(\rho_r - \rho_s) V_t \frac{J_1(Q(R+t_r)sin\alpha)}{Q(R+t_r)sin\alpha}\frac{2 \cdot sin(Q(L/2+t_f)cos\alpha)}{Q(L+2t_f)cos\alpha}
     \bigg]
     \end{align} 
@@ -130 +131 @@
 #             ["name", "units", default, [lower, upper], "type", "description"],
 parameters = [
-    ["radius",         "Ang",       20, [0, inf],    "volume",      "Cylinder core radius"],
+    ["radius",         "Ang",       80, [0, inf],    "volume",      "Cylinder core radius"],
     ["thick_rim",  "Ang",       10, [0, inf],    "volume",      "Rim shell thickness"],
     ["thick_face", "Ang",       10, [0, inf],    "volume",      "Cylinder face thickness"],
-    ["length",         "Ang",      400, [0, inf],    "volume",      "Cylinder length"],
+    ["length",         "Ang",      50, [0, inf],    "volume",      "Cylinder length"],
     ["sld_core",       "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Cylinder core scattering length density"],
     ["sld_face",       "1e-6/Ang^2", 4, [-inf, inf], "sld",         "Cylinder face scattering length density"],