r13735 - /branches/gui_testing/gui/analyses/auto_rx_base.py -- July 19, 2011 - 15:56

Author: bugman
Date: Tue Jul 19 15:56:44 2011
New Revision: 13735

URL: http://svn.gna.org/viewcvs/relax?rev=13735&view=rev
Log:
The filename variable has been converted to file_root, and has '.out' removed.

The file root is required by the auto Rx analysis.


Modified:
    branches/gui_testing/gui/analyses/auto_rx_base.py

Modified: branches/gui_testing/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_rx_base.py?rev=13735&r1=13734&r2=13735&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Tue Jul 19 15:56:44 2011
@@ -142,8 +142,8 @@
         if frq == None:
             missing.append('NMR frequency')
 
-        # Filename.
-        data.filename = '%s.%s.out' % (self.analysis_type, frq)
+        # File root.
+        data.file_root = '%s.%s' % (self.analysis_type, frq)
 
         # Increment size.
         data.inc = gui_to_int(self.grid_inc.GetValue())
@@ -496,7 +496,7 @@
             sys.stderr = redir
 
         # Execute.
-        Relax_fit(pipe_name=self.data.pipe_name, 
file_root=self.data.filename, results_directory=self.data.save_dir, 
grid_inc=self.data.inc, mc_sim_num=self.data.mc_sim_num, view_plots=False)
+        Relax_fit(pipe_name=self.data.pipe_name, 
file_root=self.data.file_root, results_directory=self.data.save_dir, 
grid_inc=self.data.inc, mc_sim_num=self.data.mc_sim_num, view_plots=False)
 
         # Alias the relax data store data.
         data = ds.relax_gui.analyses[self.data_index]
@@ -506,5 +506,5 @@
             data.results_list = []
 
         # Add Rx grace plot to the results list.
-        
data.results_list.append(data.save_dir+sep+'grace'+sep+self.data.filename+'.agr')
+        
data.results_list.append(data.save_dir+sep+'grace'+sep+self.data.file_root+'.agr')
         
data.results_list.append(data.save_dir+sep+'grace'+sep+'intensities_norm.agr')