r9107 - /branches/frame_order/specific_fns/frame_order.py -- June 19, 2009 - 16:41

Author: bugman
Date: Fri Jun 19 16:41:15 2009
New Revision: 9107

URL: http://svn.gna.org/viewcvs/relax?rev=9107&view=rev
Log:
Fixed for the __minimise_setup_tensors() method.


Modified:
    branches/frame_order/specific_fns/frame_order.py

Modified: branches/frame_order/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/specific_fns/frame_order.py?rev=9107&r1=9106&r2=9107&view=diff
==============================================================================
--- branches/frame_order/specific_fns/frame_order.py (original)
+++ branches/frame_order/specific_fns/frame_order.py Fri Jun 19 16:41:15 2009
@@ -59,36 +59,37 @@
         # Initialise.
         full_tensors = zeros(n*5, float64)
         red_tensors  = zeros(n*5, float64)
-        red_tensor_err = ones((n*5), float64)
+        red_tensor_err = ones(n*5, float64)
         data = cdp.align_tensors
         list = data.reduction
 
         # Loop over the reduction list.
         for i in range(n):
             # The full tensor.
-            full_tensors[5*i + 0] = data[list[i, 0]].Axx
-            full_tensors[5*i + 1] = data[list[i, 0]].Ayy
-            full_tensors[5*i + 2] = data[list[i, 0]].Axy
-            full_tensors[5*i + 3] = data[list[i, 0]].Axz
-            full_tensors[5*i + 4] = data[list[i, 0]].Ayz
+            print 
+            full_tensors[5*i + 0] = data[list[i][0]].Axx
+            full_tensors[5*i + 1] = data[list[i][0]].Ayy
+            full_tensors[5*i + 2] = data[list[i][0]].Axy
+            full_tensors[5*i + 3] = data[list[i][0]].Axz
+            full_tensors[5*i + 4] = data[list[i][0]].Ayz
 
             # The reduced tensor.
-            red_tensors[5*i + 0] = data[list[i, 1]].Axx
-            red_tensors[5*i + 1] = data[list[i, 1]].Ayy
-            red_tensors[5*i + 2] = data[list[i, 1]].Axy
-            red_tensors[5*i + 3] = data[list[i, 1]].Axz
-            red_tensors[5*i + 4] = data[list[i, 1]].Ayz
+            red_tensors[5*i + 0] = data[list[i][1]].Axx
+            red_tensors[5*i + 1] = data[list[i][1]].Ayy
+            red_tensors[5*i + 2] = data[list[i][1]].Axy
+            red_tensors[5*i + 3] = data[list[i][1]].Axz
+            red_tensors[5*i + 4] = data[list[i][1]].Ayz
 
             # The reduced tensor errors.
-            if hasattr(data[list[i, 1]], 'Axx_err'):
-                red_tensor_err[5*i + 0] = data[list[i, 1]].Axx_err
-                red_tensor_err[5*i + 1] = data[list[i, 1]].Ayy_err
-                red_tensor_err[5*i + 2] = data[list[i, 1]].Axy_err
-                red_tensor_err[5*i + 3] = data[list[i, 1]].Axz_err
-                red_tensor_err[5*i + 4] = data[list[i, 1]].Ayz_err
+            if hasattr(data[list[i][1]], 'Axx_err'):
+                red_tensor_err[5*i + 0] = data[list[i][1]].Axx_err
+                red_tensor_err[5*i + 1] = data[list[i][1]].Ayy_err
+                red_tensor_err[5*i + 2] = data[list[i][1]].Axy_err
+                red_tensor_err[5*i + 3] = data[list[i][1]].Axz_err
+                red_tensor_err[5*i + 4] = data[list[i][1]].Ayz_err
 
         # Return the data structures.
-        return full_tensors, red_tensor_elem, red_tensor_err
+        return full_tensors, red_tensors, red_tensor_err
 
 
     def __update_model(self):