r9116 - in /branches/frame_order/maths_fns: frame_order_matrix_ops.py frame_order_models.py -- June 19, 2009 - 17:31

Author: bugman
Date: Fri Jun 19 17:31:41 2009
New Revision: 9116

URL: http://svn.gna.org/viewcvs/relax?rev=9116&view=rev
Log:
Fix for the compilation of the Frame Order matrix.

The compile_2nd_matrix_iso_cone() function now returns the matrix as it is 
now in a different
memory location.


Modified:
    branches/frame_order/maths_fns/frame_order_matrix_ops.py
    branches/frame_order/maths_fns/frame_order_models.py

Modified: branches/frame_order/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/maths_fns/frame_order_matrix_ops.py?rev=9116&r1=9115&r2=9116&view=diff
==============================================================================
--- branches/frame_order/maths_fns/frame_order_matrix_ops.py (original)
+++ branches/frame_order/maths_fns/frame_order_matrix_ops.py Fri Jun 19 
17:31:41 2009
@@ -67,6 +67,9 @@
     # Perform T14 again to return back.
     matrix = transpose_14(matrix)
 
+    # Return the matrix.
+    return matrix
+
 
 def populate_1st_eigenframe_iso_cone(matrix, angle):
     """Populate the 1st degree Frame Order matrix in the eigenframe for an 
isotropic cone.

Modified: branches/frame_order/maths_fns/frame_order_models.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/maths_fns/frame_order_models.py?rev=9116&r1=9115&r2=9116&view=diff
==============================================================================
--- branches/frame_order/maths_fns/frame_order_models.py (original)
+++ branches/frame_order/maths_fns/frame_order_models.py Fri Jun 19 17:31:41 
2009
@@ -28,6 +28,7 @@
 from numpy import float64, ones, zeros
 
 # relax module imports.
+from generic_fns.frame_order import print_frame_order_2nd_degree
 from maths_fns.chi2 import chi2
 from maths_fns.frame_order_matrix_ops import compile_2nd_matrix_iso_cone
 from relax_errors import RelaxError
@@ -166,9 +167,10 @@
         alpha, beta, gamma, theta = params
 
         # Generate the 2nd degree Frame Order super matrix.
-        compile_2nd_matrix_iso_cone(self.frame_order_2nd, self.rot, alpha, 
beta, gamma, theta)
+        self.frame_order_2nd = 
compile_2nd_matrix_iso_cone(self.frame_order_2nd, self.rot, alpha, beta, 
gamma, theta)
 
         # Get the chi-squared value.
+        #print_frame_order_2nd_degree(self.frame_order_2nd, name=`params`)
         val = chi2(self.red_tensors, self.red_tensors, self.red_errors)
 
         # Return the chi2 value.
@@ -194,7 +196,7 @@
         alpha, beta, gamma, theta = params
 
         # Generate the 2nd degree Frame Order super matrix.
-        compile_2nd_matrix_iso_cone(self.frame_order_2nd, self.rot, alpha, 
beta, gamma, theta)
+        self.frame_order_2nd = 
compile_2nd_matrix_iso_cone(self.frame_order_2nd, self.rot, alpha, beta, 
gamma, theta)
 
         # Make the Frame Order matrix contiguous.
         self.frame_order_2nd = self.frame_order_2nd.copy()