r13209 - in /branches/gui_testing/gui/analyses: auto_noe.py auto_rx_base.py -- June 23, 2011 - 21:40

Author: bugman
Date: Thu Jun 23 21:40:17 2011
New Revision: 13209

URL: http://svn.gna.org/viewcvs/relax?rev=13209&view=rev
Log:
The data pipe names from the new analysis wizard are now being used in the 
NOE and Rx calcs.


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

Modified: branches/gui_testing/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_noe.py?rev=13209&r1=13208&r2=13209&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Thu Jun 23 21:40:17 2011
@@ -126,6 +126,12 @@
         complete = True
         missing = []
 
+        # The pipe name.
+        if hasattr(self.data, 'pipe_name'):
+            data.pipe_name = self.data.pipe_name
+        else:
+            data.pipe_name = 'noe_%s' % time.asctime(time.localtime())
+
         # The sequence data (file name, dir, mol_name_col, res_num_col, 
res_name_col, spin_num_col, spin_name_col, sep).  These are the arguments to 
the  sequence.read() user function, for more information please see the 
documentation for that function.
         if hasattr(self.data, 'sequence_file'):
             data.seq_args = [self.data.sequence_file, None, None, 1, None, 
None, None, None]
@@ -321,7 +327,7 @@
             return
 
         # Execute.
-        NOE_calc(seq_args=data.seq_args, 
pipe_name='noe'+'_'+str(time.asctime(time.localtime())), 
noe_ref=data.ref_file, noe_ref_rmsd=data.ref_rmsd, noe_sat=data.sat_file, 
noe_sat_rmsd=data.sat_rmsd, unresolved=data.unresolved, 
pdb_file=data.structure_file, output_file=data.filename, 
results_dir=data.save_dir, int_method='height', heteronuc=data.heteronuc, 
proton=data.proton, heteronuc_pdb='@N')
+        NOE_calc(seq_args=data.seq_args, pipe_name=data.pipe_name, 
noe_ref=data.ref_file, noe_ref_rmsd=data.ref_rmsd, noe_sat=data.sat_file, 
noe_sat_rmsd=data.sat_rmsd, unresolved=data.unresolved, 
pdb_file=data.structure_file, output_file=data.filename, 
results_dir=data.save_dir, int_method='height', heteronuc=data.heteronuc, 
proton=data.proton, heteronuc_pdb='@N')
 
         # Feedback about success.
         if not status.debug:

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=13209&r1=13208&r2=13209&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Thu Jun 23 21:40:17 2011
@@ -126,6 +126,12 @@
         complete = True
         missing = []
 
+        # The pipe name.
+        if hasattr(self.data, 'pipe_name'):
+            data.pipe_name = self.data.pipe_name
+        else:
+            data.pipe_name = 'rx_%s' % time.asctime(time.localtime())
+
         # The sequence data (file name, dir, mol_name_col, res_num_col, 
res_name_col, spin_num_col, spin_name_col, sep).  These are the arguments to 
the  sequence.read() user function, for more information please see the 
documentation for that function.
         if hasattr(self.data, 'sequence_file'):
             data.seq_args = [ds.relax_gui.sequencefile, None, None, 1, None, 
None, None, None]
@@ -308,7 +314,7 @@
             return
 
         # Execute.
-        Relax_fit(file_root=self.filename, 
pipe_name='rx'+'_'+str(time.asctime(time.localtime())), 
seq_args=data.seq_args, results_directory=data.save_dir, 
file_names=data.file_names, relax_times=data.relax_times, 
int_method=data.int_method, mc_num=data.mc_num, pdb_file=data.structure_file, 
unresolved=data.unresolved, view_plots = False, heteronuc=data.heteronuc, 
proton=data.proton, load_spin_ids=data.load_spin_ids, inc=data.inc)
+        Relax_fit(file_root=self.filename, pipe_name=data.pipe_name, 
seq_args=data.seq_args, results_directory=data.save_dir, 
file_names=data.file_names, relax_times=data.relax_times, 
int_method=data.int_method, mc_num=data.mc_num, pdb_file=data.structure_file, 
unresolved=data.unresolved, view_plots = False, heteronuc=data.heteronuc, 
proton=data.proton, load_spin_ids=data.load_spin_ids, inc=data.inc)
 
         # Feedback about success.
         if not status.debug: