Changeset bf09f55 in sasmodels for explore

Timestamp:

Sep 19, 2017 4:04:26 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:

62d7601

Parents:

8db25bf

Message:

updated angle calculator for jitter

File:

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

explore/angles.py

@@ +1 @@
+from __future__ import print_function
+
 import sympy as sp
-dphi, dpsi, dtheta = sp.var("dphi dpsi dtheta")
+sp.init_printing()
+dphi, dpsi, dtheta = sp.var("phi_d psi_d theta_d")
 phi, psi, theta = sp.var("phi psi theta")
 x, y, z = sp.var("x y z")
 qx, qy, qz = sp.var("qx qy qz")
+qa, qb, qc = sp.var("qa qb qc")
 
 def Rx(a):
@@ -13 +17 @@
 
 print("==== asymmetric ====")
-q = sp.Matrix([[qx],[qy],[0]])
-p = sp.Matrix([[x],[y],[z]])
+q_xy = sp.Matrix([[qx], [qy], [0]])
+q_abc = sp.Matrix([[qa], [qb], [qc]])
+p_xyz = sp.Matrix([[x], [y], [z]])
 jitter = Rx(dphi)*Ry(dtheta)*Rz(dpsi)
 view = Rz(phi)*Ry(theta)*Rz(psi)
-jitter_inv = Rz(-dpsi)*Ry(-dtheta)*Rx(-dphi)
 view_inv = Rz(-psi)*Ry(-theta)*Rz(-phi)
 print(">> jitter rotation")
-for row in jitter*p: print(row)
-print("\n>> jitter plus view")
-for row in view*jitter*p: print(row)
+for row in jitter*p_xyz: sp.pprint(row)
+#print("\n>> jitter plus view")
+#for row in view*jitter*p_xyz: sp.pprint(row)
 print("\n>> view reverse")
-for row in view_inv*q: print(row)
+for row in view_inv*q_xy: sp.pprint(row)
 print("\n>> jitter reverse")
-for row in jitter_inv*view_inv*q: print(row)
+jitter_inv = Rz(-psi)*Ry(-theta)*Rx(-phi)
+for row in jitter_inv*q_abc: sp.pprint(row)
+print("\n>> jitter view reverse")
+jitter_inv = Rz(-dpsi)*Ry(-dtheta)*Rx(-dphi)
+for row in jitter_inv*view_inv*q_xy: sp.pprint(row)
 
 print("\n\n==== symmetric ====")
-q = sp.Matrix([[qx],[0],[0]])
-p = sp.Matrix([[x],[y],[z]])
+q_x = sp.Matrix([[qx], [0], [0]])
+q_ac = sp.Matrix([[qa], [0], [qc]])
+p_xyz = sp.Matrix([[x], [y], [z]])
 jitter = Rx(dphi)*Ry(dtheta)
 view = Rz(phi)*Ry(theta)
@@ -36 +45 @@
 view_inv = Ry(-theta)*Rz(-phi)
 print(">> jitter rotation")
-for row in jitter*p: print(row)
-print("\n>> jitter plus view")
-for row in view*jitter*p: print(row)
+for row in jitter*p_xyz: sp.pprint(row)
+#print("\n>> jitter plus view")
+#for row in view*jitter*p_xyz: sp.pprint(row)
 print("\n>> view reverse")
-for row in view_inv*q: print(row)
+for row in view_inv*q_x: sp.pprint(row)
 print("\n>> jitter reverse")
-for row in jitter_inv*view_inv*q: print(row)
+for row in jitter_inv*q_ac: sp.pprint(row)