Changeset 8f04da4 in sasmodels for sasmodels/models/core_shell_ellipsoid.py

Timestamp:

Aug 2, 2017 2:53:56 AM (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:

bd21b12

Parents:

1511c37c

Message:

tuned random model generation for more models

File:

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

sasmodels/models/core_shell_ellipsoid.py

@@ -154 +154 @@
     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
+    outer_polar = 10**np.random.uniform(1.3, 4)
+    outer_equatorial = np.sqrt(V/radius_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