r9191 - /branches/frame_order/test_suite/system_tests/scripts/5_state_xz.py -- July 12, 2009 - 23:38

Author: bugman
Date: Sun Jul 12 23:38:43 2009
New Revision: 9191

URL: http://svn.gna.org/viewcvs/relax?rev=9191&view=rev
Log:
Fixes for the 5-state model system test.


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

Modified: branches/frame_order/test_suite/system_tests/scripts/5_state_xz.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/test_suite/system_tests/scripts/5_state_xz.py?rev=9191&r1=9190&r2=9191&view=diff
==============================================================================
--- branches/frame_order/test_suite/system_tests/scripts/5_state_xz.py 
(original)
+++ branches/frame_order/test_suite/system_tests/scripts/5_state_xz.py Sun 
Jul 12 23:38:43 2009
@@ -24,18 +24,11 @@
 align_tensor.init(tensor='chi5 C-dom', params=(-1/2., -1/2.,  3/8., 0.,     
0.))
 
 # Set the domain the tensors correspond to.
-n_state_model.set_domain(tensor='chi1 C-dom', domain='C')
-n_state_model.set_domain(tensor='chi2 C-dom', domain='C')
-n_state_model.set_domain(tensor='chi3 C-dom', domain='C')
-n_state_model.set_domain(tensor='chi4 C-dom', domain='C')
-n_state_model.set_domain(tensor='chi5 C-dom', domain='C')
-
-# Set that they are non-reduced tensors.
-n_state_model.set_type(tensor='chi1 C-dom', red=False)
-n_state_model.set_type(tensor='chi2 C-dom', red=False)
-n_state_model.set_type(tensor='chi3 C-dom', red=False)
-n_state_model.set_type(tensor='chi4 C-dom', red=False)
-n_state_model.set_type(tensor='chi5 C-dom', red=False)
+align_tensor.set_domain(tensor='chi1 C-dom', domain='C')
+align_tensor.set_domain(tensor='chi2 C-dom', domain='C')
+align_tensor.set_domain(tensor='chi3 C-dom', domain='C')
+align_tensor.set_domain(tensor='chi4 C-dom', domain='C')
+align_tensor.set_domain(tensor='chi5 C-dom', domain='C')
 
 # Calculate the singular values.
 align_tensor.svd(basis_set=0, tensors=['chi1 C-dom', 'chi2 C-dom', 'chi3 
C-dom', 'chi4 C-dom', 'chi5 C-dom'])
@@ -54,18 +47,18 @@
 align_tensor.init(tensor='chi5 N-dom', params=(1/20.*(2-3*sqrt(2)),   -1/2., 
  3/40.*(1+sqrt(2)+2*cos(pi/8.)),   0., 0.))
 
 # Set the domain the tensors correspond to.
-n_state_model.set_domain(tensor='chi1 N-dom', domain='N')
-n_state_model.set_domain(tensor='chi2 N-dom', domain='N')
-n_state_model.set_domain(tensor='chi3 N-dom', domain='N')
-n_state_model.set_domain(tensor='chi4 N-dom', domain='N')
-n_state_model.set_domain(tensor='chi5 N-dom', domain='N')
+align_tensor.set_domain(tensor='chi1 N-dom', domain='N')
+align_tensor.set_domain(tensor='chi2 N-dom', domain='N')
+align_tensor.set_domain(tensor='chi3 N-dom', domain='N')
+align_tensor.set_domain(tensor='chi4 N-dom', domain='N')
+align_tensor.set_domain(tensor='chi5 N-dom', domain='N')
 
-# Set that they are non-reduced tensors.
-n_state_model.set_type(tensor='chi1 N-dom', red=True)
-n_state_model.set_type(tensor='chi2 N-dom', red=True)
-n_state_model.set_type(tensor='chi3 N-dom', red=True)
-n_state_model.set_type(tensor='chi4 N-dom', red=True)
-n_state_model.set_type(tensor='chi5 N-dom', red=True)
+# Specify the tensor reductions.
+align_tensor.reduction(full_tensor='chi1 N-dom', red_tensor='chi1 C-dom')
+align_tensor.reduction(full_tensor='chi2 N-dom', red_tensor='chi2 C-dom')
+align_tensor.reduction(full_tensor='chi3 N-dom', red_tensor='chi3 C-dom')
+align_tensor.reduction(full_tensor='chi4 N-dom', red_tensor='chi4 C-dom')
+align_tensor.reduction(full_tensor='chi5 N-dom', red_tensor='chi5 C-dom')
 
 # Calculate the singular values.
 align_tensor.svd(basis_set=0, tensors=['chi1 N-dom', 'chi2 N-dom', 'chi3 
N-dom', 'chi4 N-dom', 'chi5 N-dom'])