Author: bugman
Date: Wed Mar 27 17:22:35 2013
New Revision: 19264
URL: http://svn.gna.org/viewcvs/relax?rev=19264&view=rev
Log:
Updates for the relaxation dispersion system test scripts for the newer
design of relax.
A number of changes were required as the code was quite old.
Modified:
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
Modified:
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py?rev=19264&r1=19263&r2=19264&view=diff
==============================================================================
---
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
(original)
+++
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Wed Mar 27 17:22:35 2013
@@ -1,19 +1,21 @@
# Script for CPMG relaxation dispersion curve fitting in the fast-exchange
limit.
# Python module imports.
-import __main__
from os import sep
+
+# relax module imports.
+from status import Status; status = Status()
# Create the data pipe.
pipe.create('rex', 'relax_disp')
# The path to the data files.
-data_path1 = __main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen'+sep+'500_MHz'
-data_path2 = __main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen'+sep+'800_MHz'
+data_path1 = status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen'+sep+'500_MHz'
+data_path2 = status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen'+sep+'800_MHz'
# Load the sequence.
-sequence.read('fake_sequence.in', dir=__main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen',
res_num_col=1, res_name_col=2)
+sequence.read('fake_sequence.in', dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen',
res_num_col=1, res_name_col=2)
# Name the spins so they can be matched to the assignments.
spin.name(name='N')
@@ -96,8 +98,8 @@
spectrum.error_analysis()
# Deselect unresolved spins.
-deselect.read(file='unresolved', dir=data_path_1)
-deselect.read(file='unresolved', dir=data_path_2)
+deselect.read(file='unresolved', dir=data_path_1, res_num_col=1)
+deselect.read(file='unresolved', dir=data_path_2, res_num_col=1)
# Grid search.
grid_search(inc=11)
Modified:
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py?rev=19264&r1=19263&r2=19264&view=diff
==============================================================================
---
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
(original)
+++
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
Wed Mar 27 17:22:35 2013
@@ -1,18 +1,20 @@
# Script for CPMG relaxation dispersion curve fitting in the slow-exchange
limit.
# Python module imports.
-import __main__
from os import sep
+
+# relax module imports.
+from status import Status; status = Status()
# Create the data pipe.
pipe.create('rex', 'relax_disp')
# The path to the data files.
-data_path = __main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen'+sep+'500_MHz'
+data_path = status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen'+sep+'500_MHz'
# Load the sequence.
-sequence.read('fake_sequence.in', dir=__main__.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen',
res_num_col=1, res_name_col=2)
+sequence.read('fake_sequence.in', dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting_disp'+sep+'Hansen',
res_num_col=1, res_name_col=2)
# Name the spins so they can be matched to the assignments.
spin.name(name='N')
@@ -92,7 +94,7 @@
spectrum.error_analysis()
# Deselect unresolved spins.
-deselect.read(file='unresolved', dir=data_path)
+deselect.read(file='unresolved', dir=data_path, res_num_col=1)
# Grid search.
grid_search(inc=11)
r19264 - in /branches/relax_disp/test_suite/system_tests/scripts: relax_disp_cpmg_fast.py relax_disp_cpmg_slow.py