Changeset 404ebbd in sasmodels for sasmodels/models/ellipsoid.py

Timestamp:

Jul 30, 2017 12:56:22 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:

48462b0

Parents:

a151caa

Message:

tuned random model generation for more models

File:

• sasmodels/models/ellipsoid.py (modified) (3 diffs)

sasmodels/models/ellipsoid.py

@@ -2 +2 @@
 # Note: model title and parameter table are inserted automatically
 r"""
-The form factor is normalized by the particle volume 
+The form factor is normalized by the particle volume
 
 Definition
@@ -119 +119 @@
 * **Last Modified by:** Paul Kienzle **Date:** March 22, 2017
 """
+from __future__ import division
 
 from numpy import inf, sin, cos, pi
@@ -177 +178 @@
     delta = 0.75 * b1 * b2
 
-    ddd = np.zeros_like(radius_polar)
+    #ddd = np.zeros_like(radius_polar)
     ddd[valid] = 2.0 * (delta + 1.0) * radius_polar * radius_equatorial ** 2
     return 0.5 * ddd ** (1.0 / 3.0)
 
+def random():
+    import numpy as np
+    V = 10**np.random.uniform(4, 12)
+    radius_polar = 10**np.random.uniform(1.3, 4)
+    radius_equatorial = np.sqrt(V/radius_polar) # ignore 4/3 pi
+    Vf = 10**np.random.uniform(-4, -2)
+    pars = dict(
+        #background=0, sld=0, sld_solvent=1,
+        scale=1e9*Vf/V,
+        radius_polar=radius_polar,
+        radius_equatorial=radius_equatorial,
+    )
+    return pars
 
 demo = dict(scale=1, background=0,