Changeset 9bc4882 in sasmodels for sasmodels/models/core_shell_ellipsoid.py

Timestamp:

Sep 5, 2017 11:01:03 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

8db25bf

Parents:

acc6c8f (diff), 142a8e2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-776-orientation

File:

• sasmodels/models/core_shell_ellipsoid.py (modified) (1 diff)

sasmodels/models/core_shell_ellipsoid.py

@@ -150 +150 @@
     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)
+    outer_polar = 10**np.random.uniform(1.3, 4)
+    outer_equatorial = np.sqrt(V/outer_polar) # ignore 4/3 pi
+    # Use a distribution with a preference for thin shell or thin core
+    # Avoid core,shell radii < 1
+    thickness_polar = np.random.beta(0.5, 0.5)*(outer_polar-2) + 1
+    thickness_equatorial = np.random.beta(0.5, 0.5)*(outer_equatorial-2) + 1
+    radius_polar = outer_polar - thickness_polar
+    radius_equatorial = outer_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