Changeset a151caa in sasmodels for sasmodels/models/core_shell_bicelle.py

Timestamp:

Jul 28, 2017 10:49:09 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

404ebbd

Parents:

0bdddc2

Message:

tuned random model generator for be_polyelectrolyte, barbell, core multishell, core-shell bicelle

File:

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

sasmodels/models/core_shell_bicelle.py

@@ -17 +17 @@
 .. figure:: img/core_shell_bicelle_parameters.png
 
-   Cross section of cylindrical symmetry model used here. Users will have 
-   to decide how to distribute "heads" and "tails" between the rim, face 
+   Cross section of cylindrical symmetry model used here. Users will have
+   to decide how to distribute "heads" and "tails" between the rim, face
    and core regions in order to estimate appropriate starting parameters.
 
@@ -27 +27 @@
 .. math::
 
-    \rho(r) = 
-      \begin{cases} 
+    \rho(r) =
+      \begin{cases}
       &\rho_c \text{ for } 0 \lt r \lt R; -L \lt z\lt L \\[1.5ex]
       &\rho_f \text{ for } 0 \lt r \lt R; -(L+2t) \lt z\lt -L;
@@ -47 +47 @@
 .. math::
 
-    \begin{align}    
-    F(Q,\alpha) = &\bigg[ 
+    \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}
     \bigg]
-    \end{align} 
+    \end{align}
 
 where $V_t$ is the total volume of the bicelle, $V_c$ the volume of the core,
@@ -63 +63 @@
 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, 
+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
@@ -96 +96 @@
 title = "Circular cylinder with a core-shell scattering length density profile.."
 description = """
-    P(q,alpha)= (scale/Vs)*f(q)^(2) + bkg,  where: 
+    P(q,alpha)= (scale/Vs)*f(q)^(2) + bkg,  where:
     f(q)= Vt(sld_rim - sld_solvent)* sin[qLt.cos(alpha)/2]
     /[qLt.cos(alpha)/2]*J1(qRout.sin(alpha))
@@ -147 +147 @@
           "core_shell_bicelle.c"]
 
+def random():
+    import numpy as np
+    pars = dict(
+        radius=10**np.random.uniform(1.3, 3),
+        length=10**np.random.uniform(1.3, 4),
+        thick_rim=10**np.random.uniform(0, 1.7),
+        thick_face=10**np.random.uniform(0, 1.7),
+    )
+    return pars
+
 demo = dict(scale=1, background=0,
             radius=20.0,