r28157 - /trunk/pipe_control/align_tensor.py -- December 21, 2015 - 11:14

Author: bugman
Date: Mon Dec 21 11:14:30 2015
New Revision: 28157

URL: http://svn.gna.org/viewcvs/relax?rev=28157&view=rev
Log:
Fix for bug #24218 (https://gna.org/bugs/?24218).

This is the incorrect labelling of alignment tensors by the 
align_tensor.matrix_angles user function
when a subset of tensors is specified.  The logic for the labels was expanded 
from being only for
all tensors to handling subsets.


Modified:
    trunk/pipe_control/align_tensor.py

Modified: trunk/pipe_control/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/align_tensor.py?rev=28157&r1=28156&r2=28157&view=diff
==============================================================================
--- trunk/pipe_control/align_tensor.py  (original)
+++ trunk/pipe_control/align_tensor.py  Mon Dec 21 11:14:30 2015
@@ -1055,18 +1055,27 @@
     # The table header.
     table.append([''])
     for i in range(tensor_num):
-        if cdp.align_tensors[i].name == None:
-            table[0].append(repr(i))
+        # All tensors.
+        if not tensors:
+            if cdp.align_tensors[i].name == None:
+                table[0].append(repr(i))
+            else:
+                table[0].append(cdp.align_tensors[i].name)
+
+        # Subset.
         else:
-            table[0].append(cdp.align_tensors[i].name)
+            table[0].append(tensors[i])
 
     # First loop over the rows.
     for i in range(tensor_num):
         # Add the tensor name.
-        if cdp.align_tensors[i].name == None:
-            table.append([repr(i)])
+        if not tensors:
+            if cdp.align_tensors[i].name == None:
+                table.append([repr(i)])
+            else:
+                table.append([cdp.align_tensors[i].name])
         else:
-            table.append([cdp.align_tensors[i].name])
+            table.append([tensors[i]])
 
         # Second loop over the columns.
         for j in range(tensor_num):