r18972 - /trunk/generic_fns/align_tensor.py -- March 22, 2013 - 16:24

Author: bugman
Date: Fri Mar 22 16:24:53 2013
New Revision: 18972

URL: http://svn.gna.org/viewcvs/relax?rev=18972&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r16681:16682 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r16710:16711 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r16681:16682 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r16682 into '.':
C    test_suite/system_tests/__init__.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r16710:16711 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r16711 into '.':
U    generic_fns/align_tensor.py
[edau@localhost relax-trunk]$


Modified:
    trunk/generic_fns/align_tensor.py

Modified: trunk/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=18972&r1=18971&r2=18972&view=diff
==============================================================================
--- trunk/generic_fns/align_tensor.py (original)
+++ trunk/generic_fns/align_tensor.py Fri Mar 22 16:24:53 2013
@@ -242,8 +242,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:
@@ -278,12 +276,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 = []
@@ -498,10 +490,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)):
@@ -1034,7 +1022,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.
@@ -1156,13 +1144,6 @@
     @param red_tensor:  The reduced alignment tensor.
     @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
@@ -1913,10 +1894,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:
@@ -1970,7 +1947,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.