r24855 - /branches/r1rho_plotting/test_suite/system_tests/relax_disp.py -- July 30, 2014 - 20:12

Author: tlinnet
Date: Wed Jul 30 20:11:59 2014
New Revision: 24855

URL: http://svn.gna.org/viewcvs/relax?rev=24855&view=rev
Log:
Started testing all possible combinations of graphs for R1rho analysis.

sr #3124(https://gna.org/support/?3124): Grace graphs production for R1rho 
analysis with R2_eff as function of Omega_eff.
sr #3138(https://gna.org/support/?3138): Interpolating theta through 
spin-lock offset [Omega], rather than spin-lock field strength [w1].

Modified:
    branches/r1rho_plotting/test_suite/system_tests/relax_disp.py

Modified: branches/r1rho_plotting/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/r1rho_plotting/test_suite/system_tests/relax_disp.py?rev=24855&r1=24854&r2=24855&view=diff
==============================================================================
--- branches/r1rho_plotting/test_suite/system_tests/relax_disp.py       
(original)
+++ branches/r1rho_plotting/test_suite/system_tests/relax_disp.py       Wed 
Jul 30 20:11:59 2014
@@ -4753,6 +4753,7 @@
         [Y_AXIS_R2_EFF, X_AXIS_THETA, INTERPOLATE_OFFSET]
         ]
 
+        # Define expected folder names.
         result_folders = MODELS + ['final']
 
         # Assign spin_id.
@@ -4768,10 +4769,46 @@
                 # Make the file name.
                 file_name = "%s%s.agr" % (file_name_ini, 
spin_id.replace('#', '_').replace(':', '_').replace('@', '_'))
 
+                # Get the file path.
                 file_path = get_file_path(file_name, 
result_dir_name+sep+result_folder)
 
                 print("Testing file access to graph: %s"%file_path)
                 self.assert_(access(file_path, F_OK))
+
+        # Start testing all possible combinations of graphs.
+        y_axis_types = [Y_AXIS_R2_EFF, Y_AXIS_R2_R1RHO]
+        x_axis_types = [X_AXIS_DISP, X_AXIS_THETA, X_AXIS_W_EFF]
+        interpolate_types = [INTERPOLATE_DISP, INTERPOLATE_OFFSET]
+
+        result_dir_name = "/Users/tlinnet/test"
+
+        # Loop through all possible combinations of y_axis, x_axis and 
interpolation.
+        i = 1
+        for y_axis in y_axis_types:
+            for x_axis in x_axis_types:
+                for interpolate in interpolate_types:
+                    # Determine file name:
+                    file_name_ini = 
return_grace_file_name_ini(y_axis=y_axis, x_axis=x_axis, 
interpolate=interpolate)
+
+                    # Make the file name.
+                    file_name = "%s%s.agr" % (file_name_ini, 
spin_id.replace('#', '_').replace(':', '_').replace('@', '_'))
+
+                    # Set result folder.
+                    result_folder = "%i"%(i)
+
+                    # Write the curves.
+                    dir = result_dir_name+sep+result_folder
+                    self.interpreter.relax_disp.plot_disp_curves(dir=dir, 
y_axis=y_axis, x_axis=x_axis, interpolate=interpolate, force=False)
+
+                    # Get the file path.
+                    file_path = get_file_path(file_name, dir)
+
+                    # Test the plot file exists.
+                    print("Testing file access to graph: %s"%file_path)
+                    self.assert_(access(file_path, F_OK))
+
+                    # Add to counter.
+                    i += 1
 
 
     def test_r1rho_kjaergaard_man(self):