Changeset 2556095 in sasmodels

Timestamp:

Feb 18, 2016 4:54:20 AM (9 years ago)

Author:

wojciech

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:

e66075f

Parents:

4a82d4d

Message:

Final touches for line model

File:

• sasmodels/models/line.py (modified) (7 diffs)

sasmodels/models/line.py

@@ -1 +1 @@
 r"""
 This model calculates intensity using simple linear function
+
 Definition
 ----------
@@ -24 +25 @@
 """
 from numpy import inf
-from numpy import cos
-from numpy import sin
 
 name = "line"
@@ -40 +39 @@
 # pylint: disable=bad-whitespace, line-too-long
 #             ["name", "units", default, [lower, upper], "type", "description"],
-parameters = [["intercept",     "1/cm",        1.0, [-inf, inf], "", "intercept in linear model"],
-              ["slope",     "Ang/cm",    1.0, [-inf, inf], "", "slope in linear model"],
-              ]
+parameters = [["intercept", "1/cm",   1.0, [-inf, inf], "", "intercept in linear model"],
+              ["slope",     "Ang/cm", 1.0, [-inf, inf], "", "slope in linear model"],
+             ]
 # pylint: enable=bad-whitespace, line-too-long
 
@@ -53 +52 @@
     """
     inten = intercept + slope*q
+    # TODO: In SasView code additional formula for list has been specifded.
+    # 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
 
@@ -64 +66 @@
     :return:     2D-Intensity
     """
-    #TODO: Instrcution tels 2D has different deffinition than oher models
-    #return  Iq(qy,*args)*Iq(qy,*args)
-    return  Iq(qx, *args)*Iq(qy, *args)
+    # TODO: SasView documention lists 2D intensity as Iq(qx)*Iq(qy) but in code is:
+    # return self._line(x[1])
+    return Iq(qx, *args)*Iq(qy, *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, background=0, intercept=1.0, slope=1.0)
@@ -76 +78 @@
 
 tests = [
+
+    [{'intercept':   1.0,
+      'slope': 1.0,
+     }, 1.0, 2.0],
+
+    [{'intercept':   1.0,
+      'slope': 1.0,
+     }, 0.0, 1.0],
 
     [{'intercept':   1.0,
@@ -95 +105 @@
     [{'intercept':   1.0,
       'slope': 1.0,
-     }, (1.3, 1.57), 2.30238060425],
+     }, (1.3, 1.57), 5.911],
 ]