Changeset ef8e68c in sasmodels

Timestamp:

Oct 18, 2017 9:07:04 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

aa6989b

Parents:

3c24ccd

Message:

use definition of rotation matrices from wikipedia for jitter+view equations

File:

• explore/angles.py (modified) (2 diffs)

explore/angles.py

@@ -114 +114 @@
     vprint(var.reshape(n, 1), mat.reshape(n, 1), comment=comment, post=post)
 
+# From wikipedia:
+#    https://en.wikipedia.org/wiki/Rotation_matrix#Basic_rotations
 def Rx(a):
     """Rotate y and z about x"""
-    return Matrix([[1, 0, 0], [0, cos(a), sin(a)], [0, -sin(a), cos(a)]])
+    R = [[1, 0, 0],
+         [0, +cos(a), -sin(a)],
+         [0, +sin(a), +cos(a)]]
+    return Matrix(R)
 
 def Ry(a):
     """Rotate x and z about y"""
-    return Matrix([[cos(a), 0, sin(a)], [0, 1, 0], [-sin(a), 0, cos(a)]])
+    R = [[+cos(a), 0, +sin(a)],
+         [0, 1, 0],
+         [-sin(a), 0, +cos(a)]]
+    return Matrix(R)
 
 def Rz(a):
     """Rotate x and y about z"""
-    return Matrix([[cos(a), sin(a), 0], [-sin(a), cos(a), 0], [0, 0, 1]])
+    R = [[+cos(a), -sin(a), 0],
+         [+sin(a), +cos(a), 0],
+         [0, 0, 1]]
+    return Matrix(R)
 
 
@@ -155 +166 @@
 dq_xyz = Matrix([[dqx], [dqy], [dqz]])
 
-# By comparing the code we generate to sasmodel 4.x orientation code, we
-# are apparently using the opposite convention for phi than I expected.
-# Theta
-#theta = pi/2 - theta
-phi = -phi
-dphi = -dphi
-
 def print_steps(jitter, jitter_inv, view, view_inv, qc_only):
     """