Author: bugman
Date: Tue Jul 3 12:27:16 2012
New Revision: 17154
URL: http://svn.gna.org/viewcvs/relax?rev=17154&view=rev
Log:
Fixes for the J(w) mapping and consistency testings scripts so they can run
as GUI tests.
Modified:
branches/interatomic/test_suite/system_tests/scripts/consistency_tests.py
branches/interatomic/test_suite/system_tests/scripts/consistency_tests_calc_test.py
branches/interatomic/test_suite/system_tests/scripts/jw_mapping.py
branches/interatomic/test_suite/system_tests/scripts/jw_mapping_calc_test.py
Modified:
branches/interatomic/test_suite/system_tests/scripts/consistency_tests.py
URL:
http://svn.gna.org/viewcvs/relax/branches/interatomic/test_suite/system_tests/scripts/consistency_tests.py?rev=17154&r1=17153&r2=17154&view=diff
==============================================================================
--- branches/interatomic/test_suite/system_tests/scripts/consistency_tests.py
(original)
+++ branches/interatomic/test_suite/system_tests/scripts/consistency_tests.py
Tue Jul 3 12:27:16 2012
@@ -20,11 +20,11 @@
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 spin information.
-spin.name('N')
-spin.element('N')
-sequence.attach_protons()
-spin.isotope('15N', spin_id='@N')
-spin.isotope('1H', spin_id='@H')
+self._execute_uf(uf_name='spin.name', name='N')
+self._execute_uf(uf_name='spin.element', element='N')
+self._execute_uf(uf_name='sequence.attach_protons')
+self._execute_uf(uf_name='spin.isotope', isotope='15N', spin_id='@N')
+self._execute_uf(uf_name='spin.isotope', isotope='1H', spin_id='@H')
# Define the magnetic dipole-dipole relaxation interaction.
self._execute_uf(uf_name='dipole_pair.define', spin_id1='@N', spin_id2='@H',
direct_bond=True)
Modified:
branches/interatomic/test_suite/system_tests/scripts/consistency_tests_calc_test.py
URL:
http://svn.gna.org/viewcvs/relax/branches/interatomic/test_suite/system_tests/scripts/consistency_tests_calc_test.py?rev=17154&r1=17153&r2=17154&view=diff
==============================================================================
---
branches/interatomic/test_suite/system_tests/scripts/consistency_tests_calc_test.py
(original)
+++
branches/interatomic/test_suite/system_tests/scripts/consistency_tests_calc_test.py
Tue Jul 3 12:27:16 2012
@@ -25,11 +25,11 @@
self._execute_uf(uf_name='relax_data.read', ri_id=ri_ids[i],
ri_type=ri_type[i], frq=frq[i], file=data_paths[i], res_num_col=1,
res_name_col=2, data_col=3, error_col=4)
# Set the spin information.
-spin.name('N')
-spin.element('N')
-sequence.attach_protons()
-spin.isotope('15N', spin_id='@N')
-spin.isotope('1H', spin_id='@H')
+self._execute_uf(uf_name='spin.name', name='N')
+self._execute_uf(uf_name='spin.element', element='N')
+self._execute_uf(uf_name='sequence.attach_protons')
+self._execute_uf(uf_name='spin.isotope', isotope='15N', spin_id='@N')
+self._execute_uf(uf_name='spin.isotope', isotope='1H', spin_id='@H')
# Define the magnetic dipole-dipole relaxation interaction.
self._execute_uf(uf_name='dipole_pair.define', spin_id1='@N', spin_id2='@H',
direct_bond=True)
Modified: branches/interatomic/test_suite/system_tests/scripts/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/interatomic/test_suite/system_tests/scripts/jw_mapping.py?rev=17154&r1=17153&r2=17154&view=diff
==============================================================================
--- branches/interatomic/test_suite/system_tests/scripts/jw_mapping.py
(original)
+++ branches/interatomic/test_suite/system_tests/scripts/jw_mapping.py Tue
Jul 3 12:27:16 2012
@@ -21,11 +21,11 @@
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 spin information.
-spin.name('N')
-spin.element('N')
-sequence.attach_protons()
-spin.isotope('15N', spin_id='@N')
-spin.isotope('1H', spin_id='@H')
+self._execute_uf(uf_name='spin.name', name='N')
+self._execute_uf(uf_name='spin.element', element='N')
+self._execute_uf(uf_name='sequence.attach_protons')
+self._execute_uf(uf_name='spin.isotope', isotope='15N', spin_id='@N')
+self._execute_uf(uf_name='spin.isotope', isotope='1H', spin_id='@H')
# Define the magnetic dipole-dipole relaxation interaction.
self._execute_uf(uf_name='dipole_pair.define', spin_id1='@N', spin_id2='@H',
direct_bond=True)
Modified:
branches/interatomic/test_suite/system_tests/scripts/jw_mapping_calc_test.py
URL:
http://svn.gna.org/viewcvs/relax/branches/interatomic/test_suite/system_tests/scripts/jw_mapping_calc_test.py?rev=17154&r1=17153&r2=17154&view=diff
==============================================================================
---
branches/interatomic/test_suite/system_tests/scripts/jw_mapping_calc_test.py
(original)
+++
branches/interatomic/test_suite/system_tests/scripts/jw_mapping_calc_test.py
Tue Jul 3 12:27:16 2012
@@ -25,11 +25,11 @@
self._execute_uf(uf_name='relax_data.read', ri_id=ri_ids[i],
ri_type=ri_type[i], frq=frq[i], file=data_paths[i], res_num_col=1,
res_name_col=2, data_col=3, error_col=4)
# Set the spin information.
-spin.name('N')
-spin.element('N')
-sequence.attach_protons()
-spin.isotope('15N', spin_id='@N')
-spin.isotope('1H', spin_id='@H')
+self._execute_uf(uf_name='spin.name', name='N')
+self._execute_uf(uf_name='spin.element', element='N')
+self._execute_uf(uf_name='sequence.attach_protons')
+self._execute_uf(uf_name='spin.isotope', isotope='15N', spin_id='@N')
+self._execute_uf(uf_name='spin.isotope', isotope='1H', spin_id='@H')
# Define the magnetic dipole-dipole relaxation interaction.
self._execute_uf(uf_name='dipole_pair.define', spin_id1='@N', spin_id2='@H',
direct_bond=True)
r17154 - /branches/interatomic/test_suite/system_tests/scripts/