r16457 - /branches/uf_redesign/test_suite/system_tests/scripts/consistency_tests.py -- May 25, 2012 - 18:01

Author: bugman
Date: Fri May 25 18:01:07 2012
New Revision: 16457

URL: http://svn.gna.org/viewcvs/relax?rev=16457&view=rev
Log:
Converted the consistency tests script to the new _execute_uf() design.

This allows it to work with the GUI for the GUI tests.


Modified:
    branches/uf_redesign/test_suite/system_tests/scripts/consistency_tests.py

Modified: 
branches/uf_redesign/test_suite/system_tests/scripts/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/system_tests/scripts/consistency_tests.py?rev=16457&r1=16456&r2=16457&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/system_tests/scripts/consistency_tests.py 
(original)
+++ branches/uf_redesign/test_suite/system_tests/scripts/consistency_tests.py 
Fri May 25 18:01:07 2012
@@ -9,47 +9,47 @@
 
 # Create the run.
 name = 'consistency'
-pipe.create(name, 'ct')
+self._execute_uf(uf_name='pipe.create', pipe_name=name, pipe_type='ct')
 
 # Load the sequence.
-sequence.read(status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'jw_mapping'+sep+'noe.dat', 
res_num_col=1, res_name_col=2)
+self._execute_uf(uf_name='sequence.read', status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'jw_mapping'+sep+'noe.dat', 
res_num_col=1, res_name_col=2)
 
 # Load the relaxation data.
-relax_data.read(ri_id='R1_600',  ri_type='R1',  frq=600.0*1e6, 
file=status.install_path+sep+'test_suite'+sep+'shared_data'+sep+'jw_mapping'+sep+'R1.dat',
 res_num_col=1, res_name_col=2, data_col=3, error_col=4)
-relax_data.read(ri_id='R2_600',  ri_type='R2',  frq=600.0*1e6, 
file=status.install_path+sep+'test_suite'+sep+'shared_data'+sep+'jw_mapping'+sep+'R2.dat',
 res_num_col=1, res_name_col=2, data_col=3, error_col=4)
-relax_data.read(ri_id='NOE_600', ri_type='NOE', frq=600.0*1e6, 
file=status.install_path+sep+'test_suite'+sep+'shared_data'+sep+'jw_mapping'+sep+'noe.dat',
 res_num_col=1, res_name_col=2, data_col=3, error_col=4)
+self._execute_uf(uf_name='relax_data.read', ri_id='R1_600',  ri_type='R1',  
frq=600.0*1e6, 
file=status.install_path+sep+'test_suite'+sep+'shared_data'+sep+'jw_mapping'+sep+'R1.dat',
 res_num_col=1, res_name_col=2, data_col=3, error_col=4)
+self._execute_uf(uf_name='relax_data.read', ri_id='R2_600',  ri_type='R2',  
frq=600.0*1e6, 
file=status.install_path+sep+'test_suite'+sep+'shared_data'+sep+'jw_mapping'+sep+'R2.dat',
 res_num_col=1, res_name_col=2, data_col=3, error_col=4)
+self._execute_uf(uf_name='relax_data.read', ri_id='NOE_600', ri_type='NOE', 
frq=600.0*1e6, 
file=status.install_path+sep+'test_suite'+sep+'shared_data'+sep+'jw_mapping'+sep+'noe.dat',
 res_num_col=1, res_name_col=2, data_col=3, error_col=4)
 
 # Set the nuclei types
-value.set('15N', 'heteronuc_type')
-value.set('1H', 'proton_type')
+self._execute_uf(uf_name='value.set', val='15N', param='heteronuc_type')
+self._execute_uf(uf_name='value.set', val='1H', param='proton_type')
 
 # Set the bond length and CSA values.
-value.set(1.02 * 1e-10, 'r')
-value.set(-172 * 1e-6, 'csa')
+self._execute_uf(uf_name='value.set', val=1.02 * 1e-10, param='r')
+self._execute_uf(uf_name='value.set', val=-172 * 1e-6, param='csa')
 
 # Set the angle between the 15N-1H vector and the principal axis of the 15N 
chemical shift tensor
-value.set(15.7, 'orientation')
+self._execute_uf(uf_name='value.set', val=15.7, param='orientation')
 
 # Set the approximate correlation time.
-value.set(13 * 1e-9, 'tc')
+self._execute_uf(uf_name='value.set', val=13 * 1e-9, param='tc')
 
 # Set the frequency.
-consistency_tests.set_frq(frq=600.0 * 1e6)
+self._execute_uf(uf_name='consistency_tests.set_frq', frq=600.0 * 1e6)
 
 # Consistency tests.
-calc()
+self._execute_uf(uf_name='calc')
 
 # Monte Carlo simulations.
-monte_carlo.setup(number=500)
-monte_carlo.create_data()
-calc()
-monte_carlo.error_analysis()
+self._execute_uf(uf_name='monte_carlo.setup', number=500)
+self._execute_uf(uf_name='monte_carlo.create_data')
+self._execute_uf(uf_name='calc')
+self._execute_uf(uf_name='monte_carlo.error_analysis')
 
 # Create grace files.
-grace.write(y_data_type='j0', file='devnull', force=True)
-grace.write(y_data_type='f_eta', file='devnull', force=True)
-grace.write(y_data_type='f_r2', file='devnull', force=True)
+self._execute_uf(uf_name='grace.write', y_data_type='j0', file='devnull', 
force=True)
+self._execute_uf(uf_name='grace.write', y_data_type='f_eta', file='devnull', 
force=True)
+self._execute_uf(uf_name='grace.write', y_data_type='f_r2', file='devnull', 
force=True)
 
 # Finish.
-results.write(file='devnull', force=True)
-state.save('devnull', force=True)
+self._execute_uf(uf_name='results.write', file='devnull', force=True)
+self._execute_uf(uf_name='state.save', state='devnull', force=True)