Changeset 416609b in sasmodels

Timestamp:

Apr 8, 2016 12:14:58 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:

3a45c2c, a936688, 1ca1fd9

Parents:

65279d8

Message:

use np.sqrt rather than math.sqrt for vector functions

Location:

sasmodels/models

Files:

• elliptical_cylinder.py (modified) (2 diffs)
• line.py (modified) (4 diffs)
• onion.py (modified) (1 diff)
• polymer_excl_volume.py (modified) (3 diffs)
• two_lorentzian.py (modified) (1 diff)

sasmodels/models/elliptical_cylinder.py

@@ -81 +81 @@
 """
 
-import math
-from numpy import pi, inf
+from numpy import pi, inf, sqrt
 
 name = "elliptical_cylinder"
@@ -117 +116 @@
         @param length: Length of the cylinder
     """
-    radius = math.sqrt(r_minor * r_minor * axis_ratio)
+    radius = sqrt(r_minor * r_minor * axis_ratio)
     ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius))
     return 0.5 * (ddd) ** (1. / 3.)

sasmodels/models/line.py

@@ -9 +9 @@
 .. math::
 
-    I(q) = A + B \cdot q
+    I(q) = \text{scale} (A + B \cdot q) + \text{background}
 
 .. note::
@@ -15 +15 @@
 
 .. math::
-    I(q) = I(qx) \cdot I(qy)
+    I(q) = \text{scale} (I(qx) \cdot I(qy)) + \text{background}
 
 References
@@ -51 +51 @@
     """
     inten = intercept + slope*q
-    # TODO: In SasView code additional formula for list has been specified.
-    # if inten(x) = intercept + slope*x:
-    # then if q is a list, Iq=inten(x[0]*math.cos(x[1]))*inten(x[0]*math.sin(x[1]))
     return inten
 
@@ -65 +62 @@
     :return:     2D-Intensity
     """
-    # TODO: SasView documention lists 2D intensity as Iq(qx)*Iq(qy) but code says:
-    # return self._line(x[1])
+    # TODO: SasView documents 2D intensity as Iq(qx)*Iq(qy), but returns Iq(qy)
+    # Note: SasView.run([r, theta]) does return Iq(qx)*Iq(qy)
     return Iq(qx, *args)*Iq(qy, *args)
 
 Iqxy.vectorized = True  # Iqxy accepts an array of qx, qy values
 
-demo = dict(scale=1.0, background=0, intercept=1.0, slope=1.0)
-
 tests = [
-
-    [{'intercept':   1.0,
-      'slope': 1.0,
-     }, 1.0, 2.001],
-
-    [{'intercept':   1.0,
-      'slope': 1.0,
-     }, 0.0, 1.001],
-
-    [{'intercept':   1.0,
-      'slope': 1.0,
-     }, 0.4, 1.401],
-
-    [{'intercept':   1.0,
-      'slope': 1.0,
-     }, 1.3, 2.301],
-
-    [{'intercept':   1.0,
-      'slope': 1.0,
-     }, 0.5, 1.501],
-
-    [{'intercept':   1.0,
-      'slope': 1.0,
-     }, [0.4, 0.5], [1.401, 1.501]],
-
-    [{'intercept':   1.0,
-      'slope': 1.0,
-      'background': 0.0,
-     }, (1.3, 1.57), 5.911],
+    [{'intercept': 1.0, 'slope': 1.0, }, 1.0, 2.001],
+    [{'intercept': 1.0, 'slope': 1.0, }, 0.0, 1.001],
+    [{'intercept': 1.0, 'slope': 1.0, }, 0.4, 1.401],
+    [{'intercept': 1.0, 'slope': 1.0, }, 1.3, 2.301],
+    [{'intercept': 1.0, 'slope': 1.0, }, 0.5, 1.501],
+    [{'intercept': 1.0, 'slope': 1.0, }, [0.4, 0.5], [1.401, 1.501]],
+    [{'intercept': 1.0, 'slope': 1.0, 'background': 0.0, }, (1.3, 1.57), 5.911],
 ]

sasmodels/models/onion.py

@@ -385 +385 @@
     # "A[1]": 0, "A[2]": -1, "A[3]": 1e-4, "A[4]": 1,
     }
+

sasmodels/models/polymer_excl_volume.py

@@ -93 +93 @@
 """
 
-from math import sqrt
-from numpy import inf, power
+from numpy import inf, power, sqrt
 from scipy.special import gammainc, gamma
 
@@ -114 +113 @@
 
 
-def Iq(q,
-       rg=60.0,
-       porod_exp=3.0):
+def Iq(q, rg=60.0, porod_exp=3.0):
     """
     :param q:         Input q-value (float or [float, float])
@@ -144 +141 @@
     :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.0,
-            rg=60.0,
-            porod_exp=3.0)
 
 tests = [

sasmodels/models/two_lorentzian.py

@@ -34 +34 @@
 """
 
-from math import sqrt
-from numpy import inf, power
+from numpy import inf, power, sqrt
 
 name = "two_lorentzian"