r26424 - /branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py -- November 03, 2014 - 08:31

Author: bugman
Date: Mon Nov  3 08:31:48 2014
New Revision: 26424

URL: http://svn.gna.org/viewcvs/relax?rev=26424&view=rev
Log:
The frame order matrix element simulation script now uses the Kronecker outer 
product.

This allows the frame order matrix to be in the same notation as that used 
internally in relax.  It
will cause the colours of the Sijkl_* curves to match between the simulation 
and solution scripts.

Modified:
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py?rev=26424&r1=26423&r2=26424&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
  (original)
+++ 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
  Mon Nov  3 08:31:48 2014
@@ -11,6 +11,7 @@
 from lib.errors import RelaxError
 from lib.geometry.angles import wrap_angles
 from lib.geometry.rotations import R_random_hypersphere, R_to_euler_zyz
+from lib.linear_algebra.kronecker_product import kron_prod
 from lib.text.progress import progress_meter
 
 
@@ -114,8 +115,8 @@
             phi = wrap_angles(gamma, -pi, pi)
             sigma = wrap_angles(alpha + gamma, -pi, pi)
 
-            # Pre-calculate the R outer product for speed.
-            Rx2 = outer(self.rot, self.rot)
+            # Pre-calculate the R Kronecker outer product for speed.
+            Rx2 = kron_prod(self.rot, self.rot)
 
             # Loop over the angle incs.
             for i in range(INC):