Author: bugman
Date: Tue Oct 7 21:44:00 2008
New Revision: 7557
URL: http://svn.gna.org/viewcvs/relax?rev=7557&view=rev
Log:
Fixed all the references to the shifted system test data.
Modified:
1.3/test_suite/system_tests/consistency_tests.py
1.3/test_suite/system_tests/diffusion_tensor.py
1.3/test_suite/system_tests/generic.py
1.3/test_suite/system_tests/jw_mapping.py
1.3/test_suite/system_tests/relax_fit.py
1.3/test_suite/system_tests/scripts/angles.py
1.3/test_suite/system_tests/scripts/consistency_tests.py
1.3/test_suite/system_tests/scripts/dasha.py
1.3/test_suite/system_tests/scripts/jw_mapping.py
1.3/test_suite/system_tests/scripts/palmer.py
1.3/test_suite/system_tests/scripts/relax_fit.py
1.3/test_suite/system_tests/sequence.py
Modified: 1.3/test_suite/system_tests/consistency_tests.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/consistency_tests.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/consistency_tests.py (original)
+++ 1.3/test_suite/system_tests/consistency_tests.py Tue Oct 7 21:44:00 2008
@@ -52,7 +52,7 @@
"""The consistency testing calculation test."""
# Data directory.
- dir = sys.path[-1] + '/test_suite/system_tests/data/jw_mapping/'
+ dir = sys.path[-1] + '/test_suite/shared_data/jw_mapping/'
# Data paths.
dataPaths = [dir + 'noe.dat',
@@ -70,7 +70,7 @@
f_r2 = [2.0482909381655862e-09, 1.8998154021753067e-09]
# Read the sequence.
- self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/system_tests/data')
+ self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/shared_data')
# Read the data.
for dataSet in xrange(len(dataPaths)):
@@ -114,7 +114,7 @@
"""The user function value.set()."""
# Read the sequence.
- self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/system_tests/data')
+ self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/shared_data')
# Try to set the values.
bond_length = NH_BOND_LENGTH
Modified: 1.3/test_suite/system_tests/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/diffusion_tensor.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/diffusion_tensor.py (original)
+++ 1.3/test_suite/system_tests/diffusion_tensor.py Tue Oct 7 21:44:00 2008
@@ -44,21 +44,21 @@
# Sphere tensor initialization.
self.relax.interpreter._Pipe.switch('sphere')
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb',
dir=sys.path[-1] + '/test_suite/shared_data/structures', model=1)
- self.relax.interpreter._Sequence.read(file='Ap4Aase.seq',
dir=sys.path[-1] + '/test_suite/system_tests/data/')
+ self.relax.interpreter._Sequence.read(file='Ap4Aase.seq',
dir=sys.path[-1] + '/test_suite/shared_data/')
self.relax.interpreter._Diffusion_tensor.init(10e-9, fixed=True)
self.tmpfile_sphere = mktemp()
# Spheroid tensor initialization.
self.relax.interpreter._Pipe.switch('spheroid')
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb',
dir=sys.path[-1] + '/test_suite/shared_data/structures', model=1)
- self.relax.interpreter._Sequence.read(file='Ap4Aase.seq',
dir=sys.path[-1] + '/test_suite/system_tests/data/')
+ self.relax.interpreter._Sequence.read(file='Ap4Aase.seq',
dir=sys.path[-1] + '/test_suite/shared_data/')
self.relax.interpreter._Diffusion_tensor.init((2e-8, 1.3, 60-360,
290), param_types=2, spheroid_type='prolate', fixed=True)
self.tmpfile_spheroid = mktemp()
# Ellipsoid tensor initialization.
self.relax.interpreter._Pipe.switch('ellipsoid')
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb',
dir=sys.path[-1] + '/test_suite/shared_data/structures', model=1)
- self.relax.interpreter._Sequence.read(file='Ap4Aase.seq',
dir=sys.path[-1] + '/test_suite/system_tests/data/')
+ self.relax.interpreter._Sequence.read(file='Ap4Aase.seq',
dir=sys.path[-1] + '/test_suite/shared_data/')
self.relax.interpreter._Diffusion_tensor.init((9e-8, 5e6, 0.3,
60+360, 290, 100), fixed=False)
self.tmpfile_ellipsoid = mktemp()
Modified: 1.3/test_suite/system_tests/generic.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/generic.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/generic.py (original)
+++ 1.3/test_suite/system_tests/generic.py Tue Oct 7 21:44:00 2008
@@ -51,7 +51,7 @@
self.relax.interpreter._Pipe.create(pipe_list[i], 'mf')
# Load the Lupin Ap4Aase sequence.
- self.relax.interpreter._Sequence.read(file="Ap4Aase.seq",
dir=sys.path[-1] + "/test_suite/system_tests/data")
+ self.relax.interpreter._Sequence.read(file="Ap4Aase.seq",
dir=sys.path[-1] + "/test_suite/shared_data")
# Only select residue 8.
self.relax.interpreter._Select.spin(spin_id=':8',
change_all=True)
Modified: 1.3/test_suite/system_tests/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/jw_mapping.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/jw_mapping.py (original)
+++ 1.3/test_suite/system_tests/jw_mapping.py Tue Oct 7 21:44:00 2008
@@ -51,7 +51,7 @@
"""The spectral density calculation test."""
# Data directory.
- dir = sys.path[-1] + '/test_suite/system_tests/data/jw_mapping/'
+ dir = sys.path[-1] + '/test_suite/shared_data/jw_mapping/'
# Data paths.
dataPaths = [dir + 'noe.dat',
@@ -69,7 +69,7 @@
jwh = [1.5598167512718012e-12, 2.9480536599037041e-12]
# Read the sequence.
- self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/system_tests/data')
+ self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/shared_data')
# Read the data.
for dataSet in xrange(len(dataPaths)):
@@ -107,7 +107,7 @@
"""The user function value.set()."""
# Read the sequence.
- self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/system_tests/data')
+ self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/shared_data')
# Try to set the values.
bond_length = NH_BOND_LENGTH
Modified: 1.3/test_suite/system_tests/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/relax_fit.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/relax_fit.py (original)
+++ 1.3/test_suite/system_tests/relax_fit.py Tue Oct 7 21:44:00 2008
@@ -63,7 +63,7 @@
self.relax.interpreter._Pipe.create('new', 'relax_fit')
# Load the Lupin Ap4Aase sequence.
- self.relax.interpreter._Sequence.read(file="Ap4Aase.seq",
dir=sys.path[-1] + "/test_suite/system_tests/data")
+ self.relax.interpreter._Sequence.read(file="Ap4Aase.seq",
dir=sys.path[-1] + "/test_suite/shared_data")
# Name the spins so they can be matched to the assignments.
self.relax.interpreter._Spin.name(name='N')
Modified: 1.3/test_suite/system_tests/scripts/angles.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/angles.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/angles.py (original)
+++ 1.3/test_suite/system_tests/scripts/angles.py Tue Oct 7 21:44:00 2008
@@ -2,7 +2,7 @@
# Read the sequence.
-sequence.read(file='Ap4Aase.seq', dir=sys.path[-1] +
'/test_suite/system_tests/data')
+sequence.read(file='Ap4Aase.seq', dir=sys.path[-1] +
'/test_suite/shared_data')
# Read a PDB file.
structure.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] +
'/test_suite/shared_data/structures', model=1)
Modified: 1.3/test_suite/system_tests/scripts/consistency_tests.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/consistency_tests.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/consistency_tests.py (original)
+++ 1.3/test_suite/system_tests/scripts/consistency_tests.py Tue Oct 7
21:44:00 2008
@@ -11,12 +11,12 @@
pipe.create(name, 'ct')
# Load the sequence.
-sequence.read(sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/noe.dat')
+sequence.read(sys.path[-1] + '/test_suite/shared_data/jw_mapping/noe.dat')
# Load the relaxation data.
-relax_data.read('R1', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/R1.dat')
-relax_data.read('R2', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/R2.dat')
-relax_data.read('NOE', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/noe.dat')
+relax_data.read('R1', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/R1.dat')
+relax_data.read('R2', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/R2.dat')
+relax_data.read('NOE', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/noe.dat')
# Set the nuclei types
value.set('15N', 'heteronucleus')
Modified: 1.3/test_suite/system_tests/scripts/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/dasha.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/dasha.py (original)
+++ 1.3/test_suite/system_tests/scripts/dasha.py Tue Oct 7 21:44:00 2008
@@ -16,15 +16,15 @@
pipe.create(name, 'mf')
# Load the sequence.
- sequence.read(sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/noe.dat')
+ sequence.read(sys.path[-1] +
'/test_suite/shared_data/jw_mapping/noe.dat')
# Load a PDB file.
#structure.read_pdb('example.pdb')
# Load the relaxation data.
- relax_data.read('R1', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/R1.dat')
- relax_data.read('R2', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/R2.dat')
- relax_data.read('NOE', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/noe.dat')
+ relax_data.read('R1', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/R1.dat')
+ relax_data.read('R2', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/R2.dat')
+ relax_data.read('NOE', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/noe.dat')
# Setup other values.
diffusion_tensor.init(1e-8, fixed=True)
Modified: 1.3/test_suite/system_tests/scripts/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/jw_mapping.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/jw_mapping.py (original)
+++ 1.3/test_suite/system_tests/scripts/jw_mapping.py Tue Oct 7 21:44:00 2008
@@ -11,12 +11,12 @@
pipe.create(name, 'jw')
# Load the sequence.
-sequence.read(sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/noe.dat')
+sequence.read(sys.path[-1] + '/test_suite/shared_data/jw_mapping/noe.dat')
# Load the relaxation data.
-relax_data.read('R1', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/R1.dat')
-relax_data.read('R2', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/R2.dat')
-relax_data.read('NOE', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/noe.dat')
+relax_data.read('R1', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/R1.dat')
+relax_data.read('R2', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/R2.dat')
+relax_data.read('NOE', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/noe.dat')
# Set the nuclei types
value.set('15N', 'heteronucleus')
Modified: 1.3/test_suite/system_tests/scripts/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/palmer.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/palmer.py (original)
+++ 1.3/test_suite/system_tests/scripts/palmer.py Tue Oct 7 21:44:00 2008
@@ -30,12 +30,12 @@
pipe.create(name, 'mf')
# Load the sequence.
- sequence.read(sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/noe.dat')
+ sequence.read(sys.path[-1] +
'/test_suite/shared_data/jw_mapping/noe.dat')
# Load the relaxation data.
- relax_data.read('R1', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/R1.dat')
- relax_data.read('R2', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/R2.dat')
- relax_data.read('NOE', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/system_tests/data/jw_mapping/noe.dat')
+ relax_data.read('R1', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/R1.dat')
+ relax_data.read('R2', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/R2.dat')
+ relax_data.read('NOE', '600', 600.0 * 1e6, sys.path[-1] +
'/test_suite/shared_data/jw_mapping/noe.dat')
# Setup other values.
diffusion_tensor.init(1e-8)
Modified: 1.3/test_suite/system_tests/scripts/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/relax_fit.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/relax_fit.py (original)
+++ 1.3/test_suite/system_tests/scripts/relax_fit.py Tue Oct 7 21:44:00 2008
@@ -10,7 +10,7 @@
data_path = sys.path[-1] + '/test_suite/shared_data/curve_fitting'
# Load the sequence.
-sequence.read('Ap4Aase.seq', dir=sys.path[-1] +
'/test_suite/system_tests/data')
+sequence.read('Ap4Aase.seq', dir=sys.path[-1] + '/test_suite/shared_data')
# Name the spins so they can be matched to the assignments.
spin.name(name='N')
Modified: 1.3/test_suite/system_tests/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/sequence.py?rev=7557&r1=7556&r2=7557&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/sequence.py (original)
+++ 1.3/test_suite/system_tests/sequence.py Tue Oct 7 21:44:00 2008
@@ -285,4 +285,4 @@
"""The sequence.read() test."""
# Read the sequence.
- self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/system_tests/data')
+ self.relax.interpreter._Sequence.read(file='test_seq',
dir=sys.path[-1] + '/test_suite/shared_data')
r7557 - in /1.3/test_suite/system_tests: ./ scripts/