Changeset d49ca5c in sasmodels

Timestamp:

Jul 31, 2017 6:00:13 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:

31df0c9

Parents:

109d963

Message:

tuned random model generation for core_shell_sphere

File:

• sasmodels/models/core_shell_sphere.py (modified) (2 diffs)

sasmodels/models/core_shell_sphere.py

@@ -57 +57 @@
 title = "Form factor for a monodisperse spherical particle with particle with a core-shell structure."
 description = """
-    F^2(q) = 3/V_s [V_c (sld_core-sld_shell) (sin(q*radius)-q*radius*cos(q*radius))/(q*radius)^3 
+    F^2(q) = 3/V_s [V_c (sld_core-sld_shell) (sin(q*radius)-q*radius*cos(q*radius))/(q*radius)^3
                    + V_s (sld_shell-sld_solvent) (sin(q*r_s)-q*r_s*cos(q*r_s))/(q*r_s)^3]
 
@@ -99 +99 @@
     return whole, whole - core
 
+def random():
+    import numpy as np
+    total_radius = 10**np.random.uniform(1.3, 4.3)
+    radius = np.random.uniform(0, 1)*total_radius
+    thickness = total_radius - radius
+    Vf = 10**np.random.uniform(4, 6)/total_radius**3
+    pars = dict(
+        scale=Vf,
+        radius=radius,
+        thickness=thickness,
+    )
+    return pars
+
 tests = [
     [{'radius': 20.0, 'thickness': 10.0}, 'ER', 30.0],