r6501 - in /1.3/test_suite: shared_data/model_free/ system_tests/ system_tests/data/model_free/ system_tests/scripts/ -- June 28, 2008 - 16:59

Author: bugman
Date: Sat Jun 28 16:59:16 2008
New Revision: 6501

URL: http://svn.gna.org/viewcvs/relax?rev=6501&view=rev
Log:
Shifted the model-free data into the test suite shared_data directory.

All the tests using this data have been updated.


Added:
    1.3/test_suite/shared_data/model_free/
      - copied from r6496, 1.3/test_suite/system_tests/data/model_free/
Removed:
    1.3/test_suite/system_tests/data/model_free/
Modified:
    1.3/test_suite/system_tests/model_free.py
    1.3/test_suite/system_tests/model_selection.py
    1.3/test_suite/system_tests/scripts/create_m4.py
    1.3/test_suite/system_tests/scripts/opendx_s2_te_rex.py
    
1.3/test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=6501&r1=6500&r2=6501&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Sat Jun 28 16:59:16 2008
@@ -131,7 +131,7 @@
         """Mapping the {theta, phi, Da} chi2 space through the OpenDX user 
function dx.map()."""
 
         # Path of the files.
-        path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+        path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
         # Read the sequence.
         self.relax.interpreter._Sequence.read(file='noe.500.out', dir=path)
@@ -167,7 +167,7 @@
         """Mapping the {local_tm, S2, te} chi2 space through the OpenDX user 
function dx.map()."""
 
         # Path of the files.
-        path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+        path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
         # Read the sequence.
         self.relax.interpreter._Sequence.read(file='noe.500.out', dir=path)
@@ -608,7 +608,7 @@
         """Reading of relaxation data using the user function 
relax_data.read()."""
 
         # Path of the files.
-        path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+        path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
         # Read the sequence.
         self.relax.interpreter._Sequence.read(file='noe.500.out', dir=path)
@@ -628,7 +628,7 @@
         """Read a relax 1.2 model-free results file using the user function 
results.read()."""
 
         # Read the results.
-        self.relax.interpreter._Results.read(file='results_1.2', 
dir=sys.path[-1] + '/test_suite/system_tests/data/model_free')
+        self.relax.interpreter._Results.read(file='results_1.2', 
dir=sys.path[-1] + '/test_suite/shared_data/model_free')
 
         # Alias the current data pipe.
         cdp = ds[ds.current_pipe]
@@ -766,7 +766,7 @@
         """Selecting model m4 with parameters {S2, te, Rex} using 
model_free.select_model()."""
 
         # Path of the files.
-        path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+        path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
         # Read the sequence.
         self.relax.interpreter._Sequence.read(file='noe.500.out', dir=path)
@@ -786,7 +786,7 @@
         """Setting the bond length through the user function value.set()."""
 
         # Path of the files.
-        path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+        path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
         # Read the sequence.
         self.relax.interpreter._Sequence.read(file='noe.500.out', dir=path)
@@ -805,7 +805,7 @@
         """Setting the CSA value through the user function value.set()."""
 
         # Path of the files.
-        path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+        path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
         # Read the sequence.
         self.relax.interpreter._Sequence.read(file='noe.500.out', dir=path)
@@ -824,7 +824,7 @@
         """Setting both the CSA value and bond length through the user 
function value.set()."""
 
         # Path of the files.
-        path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+        path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
         # Read the sequence.
         self.relax.interpreter._Sequence.read(file='noe.500.out', dir=path)

Modified: 1.3/test_suite/system_tests/model_selection.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_selection.py?rev=6501&r1=6500&r2=6501&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_selection.py (original)
+++ 1.3/test_suite/system_tests/model_selection.py Sat Jun 28 16:59:16 2008
@@ -45,7 +45,7 @@
         tensors = [1e-9, (1e-9, 0, 0, 0)]
 
         # Path of the files.
-        path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+        path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
         # Loop over the data pipes.
         for i in xrange(2):

Modified: 1.3/test_suite/system_tests/scripts/create_m4.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/create_m4.py?rev=6501&r1=6500&r2=6501&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/create_m4.py (original)
+++ 1.3/test_suite/system_tests/scripts/create_m4.py Sat Jun 28 16:59:16 2008
@@ -5,7 +5,7 @@
 
 
 # Path of the files.
-path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
 # Read the sequence.
 sequence.read(file='noe.500.out', dir=path)

Modified: 1.3/test_suite/system_tests/scripts/opendx_s2_te_rex.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/opendx_s2_te_rex.py?rev=6501&r1=6500&r2=6501&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/opendx_s2_te_rex.py (original)
+++ 1.3/test_suite/system_tests/scripts/opendx_s2_te_rex.py Sat Jun 28 
16:59:16 2008
@@ -8,7 +8,7 @@
 
 
 # Path of the files.
-path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
 # Read the sequence.
 sequence.read(file='noe.500.out', dir=path)

Modified: 
1.3/test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py?rev=6501&r1=6500&r2=6501&view=diff
==============================================================================
--- 
1.3/test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py 
(original)
+++ 
1.3/test_suite/system_tests/scripts/opt_setup_S2_0_970_te_2048_Rex_0_149.py 
Sat Jun 28 16:59:16 2008
@@ -11,7 +11,7 @@
 
 
 # Path of the files.
-path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
+path = sys.path[-1] + 
'/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149'
 
 # Load the sequence.
 sequence.read('noe.500.out', dir=path)