Changeset 404ebbd in sasmodels for sasmodels/models/poly_gauss_coil.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/poly_gauss_coil.py (modified) (3 diffs)

sasmodels/models/poly_gauss_coil.py

@@ -66 +66 @@
 
 description = """
-    Evaluates the scattering from 
+    Evaluates the scattering from
     polydisperse polymer chains.
     """
@@ -96 +96 @@
         p = [
             #(-1 - 20*u - 155*u**2 - 580*u**3 - 1044*u**4 - 720*u**5) / 2520.,
-            #( 1 + 14*u + 71*u**2 + 154*u**3 + 120*u**4) / 360.,
+            #(+1 + 14*u + 71*u**2 + 154*u**3 + 120*u**4) / 360.,
             #(-1 - 9*u - 26*u**2 - 24*u**3) / 60.,
-            ( 1 + 5*u + 6*u**2) / 12.,
+            (+1 + 5*u + 6*u**2) / 12.,
             (-1 - 2*u) / 3.,
-            ( 1 ),
+            (+1),
             ]
         result = 2.0 * (power(1.0 + u*z, -1.0/u) + z - 1.0) / (1.0 + u)
@@ -108 +108 @@
     return i_zero * result
 Iq.vectorized = True  # Iq accepts an array of q values
+
+def random():
+    import numpy as np
+    rg = 10**np.random.uniform(0, 4)
+    #rg = 1e3
+    polydispersity = 10**np.random.uniform(0, 3)
+    pars = dict(
+        #scale=1, background=0,
+        i_zero=1e7, # i_zero is a simple scale
+        rg=rg,
+        polydispersity=polydispersity,
+    )
+    return pars
 
 demo = dict(scale=1.0,