Changeset 6dd90c1 in sasmodels for sasmodels/models/poly_gauss_coil.py

Timestamp:

Mar 16, 2016 9:25:21 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

63776d3

Parents:

5111921

Message:

update model tests for default background of 0.001

File:

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

sasmodels/models/poly_gauss_coil.py

@@ -67 +67 @@
 
 # NB: Scale and Background are implicit parameters on every model
-def Iq(q, radius_gyration, polydispersity):
+def Iq(q, i_zero, radius_gyration, polydispersity):
     # pylint: disable = missing-docstring
-        u = polydispersity - 1.0
+    u = polydispersity - 1.0
     # TO DO
-        # should trap the case of polydispersity = 1 by switching to a taylor expansion
-        minusoneonu = -1.0 / u
-        z = ((x * radius_gyration) * (x * radius_gyration)) / (1.0 + 2.0 * u)
-        if x == 0:
-           inten = i_zero * 1.0
-        else:
-           inten = i_zero * 2.0 * (power((1.0 + u * z),minusoneonu) + z - 1.0 ) / ((1.0 + u) * (z * z))
-        return inten
-Iq.vectorized =  True  # Iq accepts an array of q values
+    # should trap the case of polydispersity = 1 by switching to a taylor expansion
+    minusoneonu = -1.0 / u
+    z = (q * radius_gyration) ** 2 / (1.0 + 2.0 * u)
+    if q == 0:
+        inten = i_zero * 1.0
+    else:
+        inten = i_zero * 2.0 * (power((1.0 + u * z),minusoneonu) + z - 1.0 ) / ((1.0 + u) * (z * z))
+    return inten
+#Iq.vectorized = True # Iq accepts an array of q values
 
 def Iqxy(qx, qy, *args):
     # pylint: disable = missing-docstring
     return Iq(sqrt(qx ** 2 + qy ** 2), *args)
-Iqxy.vectorized =  True # Iqxy accepts an array of qx, qy values
+#Iqxy.vectorized = True # Iqxy accepts an array of qx, qy values
 
 demo =  dict(scale = 1.0,