Changeset 2c74c11 in sasmodels for sasmodels/models/broad_peak.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/broad_peak.py (modified) (2 diffs)

sasmodels/models/broad_peak.py

@@ -41 +41 @@
 """
 
-from numpy import inf, sqrt
+from numpy import inf, errstate
 
 name = "broad_peak"
@@ -87 +87 @@
     :return:               Calculated intensity
     """
-
-    inten = (porod_scale / q ** porod_exp + lorentz_scale
-             / (1.0 + (abs(q - peak_pos) * lorentz_length) ** lorentz_exp))
+    z = abs(q - peak_pos) * lorentz_length
+    with errstate(divide='ignore'):
+        inten = (porod_scale / q ** porod_exp
+                 + lorentz_scale / (1 + z ** lorentz_exp))
     return inten
 Iq.vectorized = True  # Iq accepts an array of q values
-
-def Iqxy(qx, qy, *args):
-    """
-    :param qx:   Input q_x-value
-    :param qy:   Input q_y-value
-    :param args: Remaining arguments
-    :return:     2D-Intensity
-    """
-    return Iq(sqrt(qx ** 2 + qy ** 2), *args)
-Iqxy.vectorized = True # Iqxy accepts an array of qx, qy values
 
 demo = dict(scale=1, background=0,