r9119 - /branches/frame_order/maths_fns/frame_order_models.py -- June 19, 2009 - 19:22

Author: bugman
Date: Fri Jun 19 19:22:59 2009
New Revision: 9119

URL: http://svn.gna.org/viewcvs/relax?rev=9119&view=rev
Log:
The reduced tensors are now back calculated.


Modified:
    branches/frame_order/maths_fns/frame_order_models.py

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=9119&r1=9118&r2=9119&view=diff
==============================================================================
--- branches/frame_order/maths_fns/frame_order_models.py (original)
+++ branches/frame_order/maths_fns/frame_order_models.py Fri Jun 19 19:22:59 
2009
@@ -112,6 +112,7 @@
         self.full_tensors = full_tensors
         self.red_tensors = red_tensors
         self.red_errors = red_errors
+        self.red_tensors_bc = zeros(self.num_tensors, float64)
 
         # The rotation to the Frame Order eigenframe.
         self.rot = zeros((3, 3), float64)
@@ -169,9 +170,12 @@
         # Generate the 2nd degree Frame Order super matrix.
         self.frame_order_2nd = 
compile_2nd_matrix_iso_cone(self.frame_order_2nd, self.rot, alpha, beta, 
gamma, theta)
 
+        # Back calculate the reduced tensors.
+        for i in range(self.num_tensors):
+            reduce_alignment_tensor(self.frame_order_2nd, 
self.full_tensors[i*5, i*5+5], self.red_tensors_bc[i*5, i*5+5])
+
         # 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)
+        val = chi2(self.red_tensors, self.red_tensors_bc, self.red_errors)
 
         # Return the chi2 value.
         return val