Changeset 31df0c9 in sasmodels for sasmodels/models/core_shell_ellipsoid.py

Timestamp:

Aug 1, 2017 4:38:47 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:

1511c37c

Parents:

d49ca5c

Message:

tuned random model generation for more models

File:

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

sasmodels/models/core_shell_ellipsoid.py

@@ -25 +25 @@
 ellipsoid. This may have some undesirable effects if the aspect ratio of the
 ellipsoid is large (ie, if $X << 1$ or $X >> 1$ ), when the $S(q)$
-- which assumes spheres - will not in any case be valid.  Generating a 
-custom product model will enable separate effective volume fraction and effective 
+- which assumes spheres - will not in any case be valid.  Generating a
+custom product model will enable separate effective volume fraction and effective
 radius in the $S(q)$.
 
@@ -44 +44 @@
 
 .. math::
-    \begin{align}    
+    \begin{align}
     F(q,\alpha) = &f(q,radius\_equat\_core,radius\_equat\_core.x\_core,\alpha) \\
     &+ f(q,radius\_equat\_core + thick\_shell,radius\_equat\_core.x\_core + thick\_shell.x\_polar\_shell,\alpha)
-    \end{align} 
+    \end{align}
 
 where
- 
+
 .. math::
 
@@ -77 +77 @@
    F^2(q)=\int_{0}^{\pi/2}{F^2(q,\alpha)\sin(\alpha)d\alpha}
 
-For oriented ellipsoids the *theta*, *phi* and *psi* orientation parameters will appear when fitting 2D data, 
+For oriented ellipsoids the *theta*, *phi* and *psi* orientation parameters will appear when fitting 2D data,
 see the :ref:`elliptical-cylinder` model for further information.
 
@@ -151 +151 @@
     return ellipsoid_ER(polar_outer, equat_outer)
 
-
-demo = dict(scale=0.05, background=0.001,
-            radius_equat_core=20.0,
-            x_core=3.0,
-            thick_shell=30.0,
-            x_polar_shell=1.0,
-            sld_core=2.0,
-            sld_shell=1.0,
-            sld_solvent=6.3,
-            theta=0,
-            phi=0)
+def random():
+    import numpy as np
+    V = 10**np.random.uniform(5, 12)
+    radius_polar = 10**np.random.uniform(1.3, 4)
+    radius_equatorial = np.sqrt(V/radius_polar) # ignore 4/3 pi
+    thickness_polar = np.random.uniform(0.01, 1)*radius_polar
+    thickness_equatorial = np.random.uniform(0.01, 1)*radius_equatorial
+    radius_polar -= thickness_polar
+    radius_equatorial -= thickness_equatorial
+    x_core = radius_polar/radius_equatorial
+    x_polar_shell = thickness_polar/thickness_equatorial
+    pars = dict(
+        #background=0, sld=0, sld_solvent=1,
+        radius_equat_core=radius_equatorial,
+        x_core=x_core,
+        thick_shell=thickness_equatorial,
+        x_polar_shell=x_polar_shell,
+    )
+    return pars
 
 q = 0.1