r4633 - /branches/N_state_model/generic_fns/align_tensor.py -- January 11, 2008 - 11:19

Author: bugman
Date: Fri Jan 11 11:19:37 2008
New Revision: 4633

URL: http://svn.gna.org/viewcvs/relax?rev=4633&view=rev
Log:
Bug fix for the svd() and matrix_angles() functions.

The counting of tensors when all are used is fixed.


Modified:
    branches/N_state_model/generic_fns/align_tensor.py

Modified: branches/N_state_model/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/align_tensor.py?rev=4633&r1=4632&r2=4633&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/align_tensor.py (original)
+++ branches/N_state_model/generic_fns/align_tensor.py Fri Jan 11 11:19:37 
2008
@@ -730,8 +730,9 @@
     # Count the number of tensors.
     tensor_num = 0
     for tensor in cdp.align_tensor:
-        if tensors and tensor.name in tensors:
-            tensor_num = tensor_num + 1
+        if tensors and tensor.name not in tensors:
+            continue
+        tensor_num = tensor_num + 1
 
     # Create the matrix which contains the 5D vectors.
     matrix = zeros((tensor_num, 5), float64)
@@ -1374,8 +1375,9 @@
     # Count the number of tensors used in the SVD.
     tensor_num = 0
     for tensor in cdp.align_tensor:
-        if tensors and tensor.name in tensors:
-            tensor_num = tensor_num + 1
+        if tensors and tensor.name not in tensors:
+            continue
+        tensor_num = tensor_num + 1
 
     # Create the matrix to apply SVD on.
     matrix = zeros((tensor_num, 5), float64)