Changeset 8f04da4 in sasmodels for sasmodels/models/fractal_core_shell.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/fractal_core_shell.py (modified) (2 diffs)

sasmodels/models/fractal_core_shell.py

@@ -100 +100 @@
 def random():
     import numpy as np
-    total_radius = 10**np.random.uniform(0.7, 4)
-    core_portion = np.random.uniform(0, 1)
-    radius = total_radius * core_portion
-    thickness = total_radius - radius
-    #radius = 5
-    cor_length = 10**np.random.uniform(0.7, 2)*radius
-    #cor_length = 20*radius
+    outer_radius = 10**np.random.uniform(0.7, 4)
+    # Use a distribution with a preference for thin shell or thin core
+    # Avoid core,shell radii < 1
+    thickness = np.random.beta(0.5, 0.5)*(outer_radius-2) + 1
+    radius = outer_radius - thickness
+    cor_length = 10**np.random.uniform(0.7, 2)*outer_radius
     volfraction = 10**np.random.uniform(-3, -1)
-    #volfraction = 0.05
     fractal_dim = 2*np.random.beta(3, 4) + 1
-    #fractal_dim = 2
     pars = dict(
         #background=0, sld_block=1, sld_solvent=0,
@@ -119 +116 @@
     )
     return pars
-
 
 demo = dict(scale=0.05,