Changeset 2c74c11 in sasmodels for sasmodels/models/correlation_length.py

Timestamp:

Jul 24, 2016 8:56:45 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:

a4280bd

Parents:

f1765a2

Message:

implicit Iqxy; fix divide by 0 for q=0

File:

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

sasmodels/models/correlation_length.py

@@ -34 +34 @@
 """
 
-from numpy import inf, sqrt
+from numpy import inf, errstate
 
 name = "correlation_length"
@@ -57 +57 @@
     1D calculation of the Correlation length model
     """
-    porod = porod_scale / pow(q, exponent_p)
-    lorentz = lorentz_scale / (1.0 + pow(q * cor_length, exponent_l))
+    with errstate(divide='ignore'):
+        porod = porod_scale / q**exponent_p
+        lorentz = lorentz_scale / (1.0 + (q * cor_length)**exponent_l)
     inten = porod + lorentz
     return inten
-
-def Iqxy(qx, qy, lorentz_scale, porod_scale, cor_length, exponent_p, exponent_l):
-    """
-    2D calculation of the Correlation length model
-    There is no orientation contribution.
-    """
-    q = sqrt(qx ** 2 + qy ** 2)
-    return Iq(q, lorentz_scale, porod_scale, cor_length, exponent_p, exponent_l)
+Iq.vectorized = True
 
 # parameters for demo