Changeset 31df0c9 in sasmodels for sasmodels/models/hollow_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/hollow_cylinder.py (modified) (2 diffs)

sasmodels/models/hollow_cylinder.py

@@ -54 +54 @@
 
 * **Author:** NIST IGOR/DANSE **Date:** pre 2010
-* **Last Modified by:** Richard Heenan **Date:** October 06, 2016 
+* **Last Modified by:** Richard Heenan **Date:** October 06, 2016
    (reparametrised to use thickness, not outer radius)
 * **Last Reviewed by:** Richard Heenan **Date:** October 06, 2016
@@ -121 +121 @@
     return vol_shell, vol_total
 
-# parameters for demo
-demo = dict(scale=1.0, background=0.0, length=400.0, radius=20.0,
-            thickness=10, sld=6.3, sld_solvent=1, theta=90, phi=0,
-            thickness_pd=0.2, thickness_pd_n=9,
-            length_pd=.2, length_pd_n=10,
-            radius_pd=.2, radius_pd_n=9,
-            theta_pd=10, theta_pd_n=5,
-           )
+def random():
+    import numpy as np
+    length = 10**np.random.uniform(2, 6)
+    radius = 10**np.random.uniform(1, 3)
+    kuhn_length = 10**np.random.uniform(-2, -0.7)*length  # at least 10 segments
+    pars = dict(
+        length=length,
+        radius=radius,
+        kuhn_length=kuhn_length,
+    )
+    return pars
+
 q = 0.1
 # april 6 2017, rkh added a 2d unit test, assume correct!