r25857 - in /trunk: auto_analyses/relax_disp_repeat_cpmg.py test_suite/system_tests/relax_disp.py -- September 16, 2014 - 13:42

Author: tlinnet
Date: Tue Sep 16 13:42:13 2014
New Revision: 25857

URL: http://svn.gna.org/viewcvs/relax?rev=25857&view=rev
Log:
Adding writing out of png files from matplotlib, when looking at statistics.

Task #7826 (https://gna.org/task/index.php?7826): Write an python class for 
the repeated analysis of dispersion data.

Modified:
    trunk/auto_analyses/relax_disp_repeat_cpmg.py
    trunk/test_suite/system_tests/relax_disp.py

Modified: trunk/auto_analyses/relax_disp_repeat_cpmg.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/relax_disp_repeat_cpmg.py?rev=25857&r1=25856&r2=25857&view=diff
==============================================================================
--- trunk/auto_analyses/relax_disp_repeat_cpmg.py       (original)
+++ trunk/auto_analyses/relax_disp_repeat_cpmg.py       Tue Sep 16 13:42:13 
2014
@@ -1362,12 +1362,20 @@
         ax2.set_ylim(min_r_xy2*0.95, max_r_xy2*1.05)
         ax2.invert_xaxis()
 
+        # Determine filename.
+        if selection == None:
+            file_name_ini = 'r2eff_stat_all'
+        else:
+            file_name_ini = 'r2eff_stat_sel'
+
+        # Write png.
+        png_file_name = file_name_ini + '.png'
+        png_file_path = get_file_path(file_name=png_file_name, 
dir=self.results_dir)
+        plt.savefig(png_file_path, bbox_inches='tight')
+
         # Write to file.
         if write_stats:
-            if selection == None:
-                file_name = 'r2eff_stat_all.txt'
-            else:
-                file_name = 'r2eff_stat_sel.txt'
+            file_name = file_name_ini + '.txt'
             path = self.results_dir
             file_obj, file_path = open_write_file(file_name=file_name, 
dir=path, force=True, compress_type=0, verbosity=1, return_path=True)
 

Modified: trunk/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=25857&r1=25856&r2=25857&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Tue Sep 16 13:42:13 2014
@@ -6048,32 +6048,32 @@
 
 
         # Try plot some R2eff statistics.
-        if False:
+        if True:
             # Collect r2eff values.
-            selection = ':2,3'
-            r2eff_ft_sel = RDR.col_r2eff(method='FT', list_glob_ini=[128, 
126], selection=selection)
-            r2eff_mdd_sel = RDR.col_r2eff(method='MDD', list_glob_ini=[128, 
126], selection=selection)
-
-            # Get R2eff stats.
-            r2eff_stat_dic = 
RDR.get_r2eff_stat_dic(list_r2eff_dics=[r2eff_ft_sel, r2eff_mdd_sel], 
list_glob_ini=[128, 126])
-
-            ## Plot R2eff stats
-            write_stats = True
-            RDR.plot_r2eff_stat(r2eff_stat_dic=r2eff_stat_dic, 
methods=['FT', 'MDD'], list_glob_ini=[128, 126, 6], show=False, 
write_stats=write_stats)
-
-            # Open stat file.
-            if write_stats:
-                if selection == None:
-                    file_name = 'r2eff_stat_all.txt'
-                else:
-                    file_name = 'r2eff_stat_sel.txt'
-                path = RDR.results_dir
-                data = extract_data(file=file_name, dir=path)
-
-                # Loop over the lines.
-                for i, data_i in enumerate(data):
-                    print(i, data_i)
-
+            selections = [None, ':2,3']
+            for selection in selections:
+                r2eff_ft_sel = RDR.col_r2eff(method='FT', 
list_glob_ini=[128, 126], selection=selection)
+                r2eff_mdd_sel = RDR.col_r2eff(method='MDD', 
list_glob_ini=[128, 126], selection=selection)
+
+                # Get R2eff stats.
+                r2eff_stat_dic = 
RDR.get_r2eff_stat_dic(list_r2eff_dics=[r2eff_ft_sel, r2eff_mdd_sel], 
list_glob_ini=[128, 126])
+
+                ## Plot R2eff stats
+                write_stats = True
+                RDR.plot_r2eff_stat(r2eff_stat_dic=r2eff_stat_dic, 
methods=['FT', 'MDD'], list_glob_ini=[128, 126, 6], show=False, 
write_stats=write_stats)
+
+                # Open stat file.
+                if write_stats:
+                    if selection == None:
+                        file_name = 'r2eff_stat_all.txt'
+                    else:
+                        file_name = 'r2eff_stat_sel.txt'
+                    path = RDR.results_dir
+                    data = extract_data(file=file_name, dir=path)
+
+                    # Loop over the lines.
+                    for i, data_i in enumerate(data):
+                        print(i, data_i)
 
         # Do minimisation
         if False: