Changeset 8f04da4 in sasmodels for sasmodels/models/binary_hard_sphere.py

Timestamp:

Aug 2, 2017 12:53:56 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:

bd21b12

Parents:

1511c37c

Message:

tuned random model generation for more models

File:

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

sasmodels/models/binary_hard_sphere.py

@@ -110 +110 @@
 source = ["lib/sas_3j1x_x.c", "binary_hard_sphere.c"]
 
+def random():
+    import numpy as np
+    # TODO: binary_hard_sphere fails at low qr
+    radius_lg = 10**np.random.uniform(2, 4.7)
+    radius_sm = 10**np.random.uniform(2, 4.7)
+    volfraction_lg = 10**np.random.uniform(-3, -0.3)
+    volfraction_sm = 10**np.random.uniform(-3, -0.3)
+    # TODO: Get slightly different results if large and small are swapped
+    # modify the model so it doesn't care which is which
+    if radius_lg < radius_sm:
+        radius_lg, radius_sm = radius_sm, radius_lg
+        volfraction_lg, volfraction_sm = volfraction_sm, volfraction_lg
+    pars = dict(
+        radius_lg=radius_lg,
+        radius_sm=radius_sm,
+        volfraction_lg=volfraction_lg,
+        volfraction_sm=volfraction_sm,
+    )
+    return pars
+
 # parameters for demo and documentation
 demo = dict(sld_lg=3.5, sld_sm=0.5, sld_solvent=6.36,