r16711 - /branches/frame_order_testing/generic_fns/align_tensor.py -- June 06, 2012 - 18:17

Author: bugman
Date: Wed Jun  6 18:17:28 2012
New Revision: 16711

URL: http://svn.gna.org/viewcvs/relax?rev=16711&view=rev
Log:
Another set of fixes for the bad merge at r16679.

For some reason the branch changes to the generic_fns.align_tensor module had 
been reverted in the
merger.


Modified:
    branches/frame_order_testing/generic_fns/align_tensor.py

Modified: branches/frame_order_testing/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/align_tensor.py?rev=16711&r1=16710&r2=16711&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/align_tensor.py (original)
+++ branches/frame_order_testing/generic_fns/align_tensor.py Wed Jun  6 
18:17:28 2012
@@ -232,8 +232,6 @@
     # Test if alignment tensor data exists.
     if tensor and not align_data_exists(tensor):
         raise RelaxNoTensorError('alignment')
-    if not hasattr(cdp, 'align_tensors') or len(cdp.align_tensors) == 0 or 
not hasattr(cdp, 'align_ids'):
-        raise RelaxNoTensorError('alignment')
 
     # The tensor list.
     if tensor:
@@ -268,12 +266,6 @@
 
     # Test if the current data pipe exists.
     pipes.test()
-
-    # Test if alignment tensor data exists.
-    if tensor and not align_data_exists(tensor):
-        raise RelaxNoTensorError('alignment')
-    if not hasattr(cdp, 'align_tensors') or len(cdp.align_tensors) == 0 or 
not hasattr(cdp, 'align_ids'):
-        raise RelaxNoTensorError('alignment')
 
     # Construct the tensor list.
     tensor_list = []
@@ -488,10 +480,6 @@
 
     # Test if the current data pipe exists.
     pipes.test()
-
-    # Test if alignment tensor data exists.
-    if not hasattr(cdp, 'align_tensors') or not hasattr(cdp, 'align_ids'):
-        raise RelaxNoTensorError('alignment')
 
     # Loop over the tensors.
     for i in range(len(cdp.align_tensors)):
@@ -1005,7 +993,7 @@
     """
 
     # Test that alignment tensor data exists.
-    if not hasattr(cdp, 'align_tensors') or len(cdp.align_tensors) == 0 or 
not hasattr(cdp, 'align_ids'):
+    if not hasattr(cdp, 'align_tensors') or len(cdp.align_tensors) == 0:
         raise RelaxNoTensorError('alignment')
 
     # Count the number of tensors.
@@ -1124,13 +1112,6 @@
     @type red_tensor:   str
     """
 
-    # Test if the current data pipe exists.
-    pipes.test()
-
-    # Test if alignment tensor data exists.
-    if not hasattr(cdp, 'align_tensors') or len(cdp.align_tensors) == 0 or 
not hasattr(cdp, 'align_ids'):
-        raise RelaxNoTensorError('alignment')
-
     # Tensor information.
     match_full = False
     match_red = False
@@ -1880,10 +1861,6 @@
     if not hasattr(cdp, 'domain') or domain not in cdp.domain.keys():
         raise RelaxError("The domain '%s' has not been defined.  Please use 
the domain user function." % domain)
 
-    # Test if alignment tensor data exists.
-    if not hasattr(cdp, 'align_tensors') or len(cdp.align_tensors) == 0 or 
not hasattr(cdp, 'align_ids'):
-        raise RelaxNoTensorError('alignment')
-
     # Loop over the tensors.
     match = False
     for tensor_cont in cdp.align_tensors:
@@ -1937,7 +1914,7 @@
     """
 
     # Test that alignment tensor data exists.
-    if not hasattr(cdp, 'align_tensors') or len(cdp.align_tensors) == 0 or 
not hasattr(cdp, 'align_ids'):
+    if not hasattr(cdp, 'align_tensors') or len(cdp.align_tensors) == 0:
         raise RelaxNoTensorError('alignment')
 
     # Count the number of tensors used in the SVD.