Changeset 59ee4db in sasmodels

Timestamp:

Dec 4, 2017 1:20:22 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Children:

7f79cba

Parents:

7a40b08

Message:

replace sincos with sin,cos in python cylinder example

Location:

sasmodels

Files:

• codegen.py (modified) (1 diff)
• models/_cylpy.py (modified) (2 diffs)

sasmodels/codegen.py

@@ -678 +678 @@
     x = sin(y) + cos(z.real)
     print("world", outside)
+    a, b = x, y
+    [a, b] = (x, y)
+    (a, b) = [x, y]
 
 if __name__ == "__main__":

sasmodels/models/_cylpy.py

@@ -102 +102 @@
 import numpy as np  # type: ignore
 from sasmodels.special import sas_2J1x_x, sas_sinx_x, pi, inf, sincos, square, gauss76 as gauss
+from sasmodels.special import sin, cos
 
 name = "cylinder"
@@ -154 +155 @@
     for i in range(gauss.n):
         theta = gauss.z[i]*zm + zb
-        sin_theta, cos_theta = sincos(theta)
+        # TODO: should be using u-substitution of cos(theta) over [0, 1]
+        #sin_theta, cos_theta = sincos(theta)
+        sin_theta = sin(theta)
+        cos_theta = cos(theta)
         form = fq(q*sin_theta, q*cos_theta, radius, length)
         total += gauss.w[i] * form * form * sin_theta