r4561 - /branches/N_state_model/test_suite/system_tests/scripts/5_state_xz.py -- January 09, 2008 - 17:01

Author: bugman
Date: Wed Jan  9 17:01:13 2008
New Revision: 4561

URL: http://svn.gna.org/viewcvs/relax?rev=4561&view=rev
Log:
Modified the 5-state system test.

The SVD and matrix angles user functions have been shifted back to the 
align_tensor user function
base class.  To compensate, the 'tensors' arg has been added so that a select 
set of tensors can be
operated on.


Modified:
    branches/N_state_model/test_suite/system_tests/scripts/5_state_xz.py

Modified: branches/N_state_model/test_suite/system_tests/scripts/5_state_xz.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/system_tests/scripts/5_state_xz.py?rev=4561&r1=4560&r2=4561&view=diff
==============================================================================
--- branches/N_state_model/test_suite/system_tests/scripts/5_state_xz.py 
(original)
+++ branches/N_state_model/test_suite/system_tests/scripts/5_state_xz.py Wed 
Jan  9 17:01:13 2008
@@ -38,12 +38,12 @@
 n_state_model.set_type(tensor='chi5 C-dom', red=False)
 
 # Calculate the singular values.
-n_state_model.svd(basis_set=0, domain='C')
-n_state_model.svd(basis_set=1, domain='C')
+align_tensor.svd(basis_set=0, tensors=['chi1 C-dom', 'chi2 C-dom', 'chi3 
C-dom', 'chi4 C-dom', 'chi5 C-dom'])
+align_tensor.svd(basis_set=1, tensors=['chi1 C-dom', 'chi2 C-dom', 'chi3 
C-dom', 'chi4 C-dom', 'chi5 C-dom'])
 
 # Calculate the angles between the matrices.
-n_state_model.matrix_angles(basis_set=0, domain='C')
-n_state_model.matrix_angles(basis_set=1, domain='C')
+align_tensor.matrix_angles(basis_set=0, tensors=['chi1 C-dom', 'chi2 C-dom', 
'chi3 C-dom', 'chi4 C-dom', 'chi5 C-dom'])
+align_tensor.matrix_angles(basis_set=1, tensors=['chi1 C-dom', 'chi2 C-dom', 
'chi3 C-dom', 'chi4 C-dom', 'chi5 C-dom'])
 
 
 # Load the N-terminal alignment tensors.
@@ -68,12 +68,12 @@
 n_state_model.set_type(tensor='chi5 N-dom', red=True)
 
 # Calculate the singular values.
-n_state_model.svd(basis_set=0, domain='N')
-n_state_model.svd(basis_set=1, domain='N')
+align_tensor.svd(basis_set=0, domain='N', tensors=['chi1 N-dom', 'chi2 
N-dom', 'chi3 N-dom', 'chi4 N-dom', 'chi5 N-dom'])
+align_tensor.svd(basis_set=1, domain='N', tensors=['chi1 N-dom', 'chi2 
N-dom', 'chi3 N-dom', 'chi4 N-dom', 'chi5 N-dom'])
 
 # Calculate the angles between the matrices.
-n_state_model.matrix_angles(basis_set=0, domain='N')
-n_state_model.matrix_angles(basis_set=1, domain='N')
+align_tensor.matrix_angles(basis_set=0, domain='N', tensors=['chi1 N-dom', 
'chi2 N-dom', 'chi3 N-dom', 'chi4 N-dom', 'chi5 N-dom'])
+align_tensor.matrix_angles(basis_set=1, domain='N', tensors=['chi1 N-dom', 
'chi2 N-dom', 'chi3 N-dom', 'chi4 N-dom', 'chi5 N-dom'])
 
 
 # Grid search.