r27443 - in /trunk/test_suite/system_tests: diffusion_tensor.py scripts/diff_tensor/ri_back_calc.py -- February 02, 2015 - 17:25

Author: bugman
Date: Mon Feb  2 17:25:22 2015
New Revision: 27443

URL: http://svn.gna.org/viewcvs/relax?rev=27443&view=rev
Log:
Updates for many of the Diffusion_tensor system tests.

This is due to the changed directory names in 
test_suite/shared_data/diffusion_tensor/.  The
ds.diff_dir variable has been introduced to point to the correct data 
directory.


Modified:
    trunk/test_suite/system_tests/diffusion_tensor.py
    trunk/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py

Modified: trunk/test_suite/system_tests/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/diffusion_tensor.py?rev=27443&r1=27442&r2=27443&view=diff
==============================================================================
--- trunk/test_suite/system_tests/diffusion_tensor.py   (original)
+++ trunk/test_suite/system_tests/diffusion_tensor.py   Mon Feb  2 17:25:22 
2015
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2014 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2015 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -348,6 +348,7 @@
         reset()
 
         # The diffusion type (used by the script).
+        ds.diff_dir = 'ellipsoid'
         ds.diff_type = 'ellipsoid'
 
         # Execute the script.
@@ -370,6 +371,7 @@
         reset()
 
         # The diffusion type (used by the script).
+        ds.diff_dir = 'sphere'
         ds.diff_type = 'sphere'
 
         # Execute the script.
@@ -392,6 +394,7 @@
         reset()
 
         # The diffusion type (used by the script).
+        ds.diff_dir = 'spheroid_prolate'
         ds.diff_type = 'spheroid'
 
         # Execute the script.
@@ -927,6 +930,7 @@
         reset()
 
         # The diffusion type (used by the script).
+        ds.diff_dir = 'ellipsoid'
         ds.diff_type = 'ellipsoid'
 
         # Execute the script.
@@ -954,6 +958,7 @@
         reset()
 
         # The diffusion type (used by the script).
+        ds.diff_dir = 'sphere'
         ds.diff_type = 'sphere'
 
         # Execute the script.
@@ -982,6 +987,7 @@
         reset()
 
         # The diffusion type (used by the script).
+        ds.diff_dir = 'spheroid_prolate'
         ds.diff_type = 'spheroid'
 
         # Execute the script.

Modified: trunk/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py?rev=27443&r1=27442&r2=27443&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py   
(original)
+++ trunk/test_suite/system_tests/scripts/diff_tensor/ri_back_calc.py   Mon 
Feb  2 17:25:22 2015
@@ -14,12 +14,14 @@
 # Stand alone operation.
 if not hasattr(ds, 'diff_type'):
     ds.diff_type = 'ellipsoid'
+if not hasattr(ds, 'diff_dir'):
+    ds.diff_dir = 'ellipsoid'
 
 # A data pipe.
 pipe.create('back_calc', 'mf')
 
 # Path of the files.
-path = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'diffusion_tensor'+sep+ds.diff_type
+path = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'diffusion_tensor'+sep+ds.diff_dir
 
 # Load the sequence.
 sequence.read('NOE.500.out', dir=path, res_num_col=1)