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

Timestamp:

Aug 1, 2017 2: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/capped_cylinder.py (modified) (2 diffs)

sasmodels/models/capped_cylinder.py

@@ -80 +80 @@
 
 .. [#] H Kaya, *J. Appl. Cryst.*, 37 (2004) 223-230
-.. [#] H Kaya and N-R deSouza, *J. Appl. Cryst.*, 37 (2004) 508-509 (addenda 
+.. [#] H Kaya and N-R deSouza, *J. Appl. Cryst.*, 37 (2004) 508-509 (addenda
    and errata)
 
@@ -136 +136 @@
 source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "capped_cylinder.c"]
 
+def random():
+    import numpy as np
+    # TODO: increase volume range once problem with bell radius is fixed
+    # The issue is that bell radii of more than about 200 fail at high q
+    V = 10**np.random.uniform(7, 9)
+    bar_volume = 10**np.random.uniform(-4, -1)*V
+    bell_volume = V - bar_volume
+    bell_radius = (bell_volume/6)**0.3333  # approximate
+    min_bar = bar_volume/np.pi/bell_radius**2
+    bar_length = 10**np.random.uniform(0, 3)*min_bar
+    bar_radius = np.sqrt(bar_volume/bar_length/np.pi)
+    if bar_radius > bell_radius:
+        bell_radius, bar_radius = bar_radius, bell_radius
+    pars = dict(
+        #background=0,
+        radius_cap=bell_radius,
+        radius=bar_radius,
+        length=bar_length,
+    )
+    return pars
+
+
 demo = dict(scale=1, background=0,
             sld=6, sld_solvent=1,