Changeset 64eecf7 in sasmodels for sasmodels/models/fractal_core_shell.py

Timestamp:

Sep 5, 2017 9:40:09 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:

30b60d2

Parents:

a53bf6b (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-510

File:

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

sasmodels/models/fractal_core_shell.py

@@ -98 +98 @@
           "lib/fractal_sq.c", "fractal_core_shell.c"]
 
+def random():
+    import numpy as np
+    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)
+    fractal_dim = 2*np.random.beta(3, 4) + 1
+    pars = dict(
+        #background=0, sld_block=1, sld_solvent=0,
+        volfraction=volfraction,
+        radius=radius,
+        cor_length=cor_length,
+        fractal_dim=fractal_dim,
+    )
+    return pars
+
 demo = dict(scale=0.05,
             background=0,