r24870 - /branches/r1rho_plotting/test_suite/system_tests/relax_disp.py -- July 31, 2014 - 11:53

Author: tlinnet
Date: Thu Jul 31 11:53:48 2014
New Revision: 24870

URL: http://svn.gna.org/viewcvs/relax?rev=24870&view=rev
Log:
Fix for systemtest, after movind graphs to check against.

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=24870&r1=24869&r2=24870&view=diff
==============================================================================
--- branches/r1rho_plotting/test_suite/system_tests/relax_disp.py       
(original)
+++ branches/r1rho_plotting/test_suite/system_tests/relax_disp.py       Thu 
Jul 31 11:53:48 2014
@@ -4159,8 +4159,6 @@
         data_path = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'KTeilum_FMPoulsen_MAkke_2006'+sep+expfolder+sep+'check_graphs'
 
         for result_folder in result_folders:
-            # Initial counter per graph, per model.
-            i = 1
             for y_axis in y_axis_types:
                 for x_axis in x_axis_types:
                     for interpolate in interpolate_types:
@@ -4170,11 +4168,8 @@
                         # Make the file name.
                         file_name = "%s%s.agr" % (file_name_ini, 
spin_id.replace('#', '_').replace(':', '_').replace('@', '_'))
 
-                        # Set result folder.
-                        dir_folder = "%i"%(i)
-
                         # Write the curves.
-                        dir = 
result_dir_name+sep+result_folder+sep+dir_folder
+                        dir = result_dir_name+sep+result_folder
                         print("Plotting combination of %s, %s, %s"%(y_axis, 
x_axis, interpolate))
                         
self.interpreter.relax_disp.plot_disp_curves(dir=dir, y_axis=y_axis, 
x_axis=x_axis, interpolate=interpolate, force=True)
 
@@ -4191,7 +4186,7 @@
                         file_prod.close()
 
                         # Define file to compare against.
-                        #dir_comp = 
data_path+sep+result_folder+sep+dir_folder
+                        #dir_comp = data_path+sep+result_folder
                         #file_path_comp = get_file_path(file_name, dir_comp)
                         #file_comp = open(file_path_comp)
                         #lines_comp = file_comp.readlines()
@@ -4211,9 +4206,6 @@
                         #        x_comp, y_comp, y_comp_err = 
lines_comp[j].split()
                         #        self.assertAlmostEqual(float(x_prod), 
float(x_comp))
                         #        self.assertAlmostEqual(float(y_prod), 
float(y_comp))
-
-                        # Add to counter.
-                        i += 1
 
 
     def test_kteilum_fmpoulsen_makke_cpmg_data_048m_guhcl_to_cr72(self):
@@ -4942,8 +4934,6 @@
         data_path = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'Kjaergaard_et_al_2013'+sep+'check_graphs'
 
         for result_folder in result_folders:
-            # Initial counter per graph, per model.
-            i = 1
             for y_axis in y_axis_types:
                 for x_axis in x_axis_types:
                     for interpolate in interpolate_types:
@@ -4953,11 +4943,8 @@
                         # Make the file name.
                         file_name = "%s%s.agr" % (file_name_ini, 
spin_id.replace('#', '_').replace(':', '_').replace('@', '_'))
 
-                        # Set result folder.
-                        dir_folder = "%i"%(i)
-
                         # Write the curves.
-                        dir = 
result_dir_name+sep+result_folder+sep+dir_folder
+                        dir = result_dir_name+sep+result_folder
                         print("Plotting combination of %s, %s, %s"%(y_axis, 
x_axis, interpolate))
                         
self.interpreter.relax_disp.plot_disp_curves(dir=dir, y_axis=y_axis, 
x_axis=x_axis, interpolate=interpolate, force=True)
 
@@ -4974,7 +4961,7 @@
                         file_prod.close()
 
                         # Define file to compare against.
-                        dir_comp = data_path+sep+result_folder+sep+dir_folder
+                        dir_comp = data_path+sep+result_folder
                         file_path_comp = get_file_path(file_name, dir_comp)
                         file_comp = open(file_path_comp)
                         lines_comp = file_comp.readlines()