Changeset f39d4a3 in sasmodels for explore

Timestamp:

Oct 26, 2017 12:03:38 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:

b9578fc

Parents:

3bfd924

Message:

twiddle with explore/angles.py; no change in angle defn

File:

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

explore/angles.py

@@ -161 +161 @@
 
 # various vectors
+xyz = Matrix([[x], [y], [z]])
+x_hat = Matrix([[x], [0], [0]])
+y_hat = Matrix([[0], [y], [0]])
+z_hat = Matrix([[0], [0], [z]])
 q_xy = Matrix([[qx], [qy], [0]])
 q_abc = Matrix([[qa], [qb], [qc]])
@@ -173 +177 @@
     if 0:  # forward calculations
         vprint(q_xyz, jitter*q_abc, "apply jitter")
+        #vprint(xyz, jitter*z_hat, "r")
+        #mprint(J, jitter, "forward jitter")
         vprint(dq_xyz, view*q_xyz, "apply view after jitter")
+        #mprint(V, view, "forward view")
 
         #vprint(dq_xyz, view*jitter*q_abc, "combine view and jitter")
-        mprint(M, view*jitter, "forward matrix")
+        mprint(R, view*jitter, "forward matrix")
 
     if 1:  # reverse calculations
@@ -196 +203 @@
         mprint(q_abc[index,:], (R*q_xy)[index,:], "applied reverse matrix")
         #mprint(q_abc, J*V*q_xy, "applied reverse matrix")
-        #mprint(M, jitter_inv*view_inv, "reverse matrix direct")
+        #mprint(R[index,:2], jitter_inv*view_inv, "reverse matrix direct")
 
         #vprint(q_abc, M*q_xy, "matrix application")
@@ -210 +217 @@
     )
 
+if 1:
     comment("\n\n==== symmetric ====")
     print_steps(