r10901 - /branches/bieri_gui/gui_bieri/analyses/auto_noe.py -- February 24, 2010 - 06:09

Author: michaelbieri
Date: Wed Feb 24 06:09:15 2010
New Revision: 10901

URL: http://svn.gna.org/viewcvs/relax?rev=10901&view=rev
Log:
The function execute_thread() originally copied from auto_rx_base.py was 
adapted to execute NOE analysis.



Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_noe.py

Modified: branches/bieri_gui/gui_bieri/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_noe.py?rev=10901&r1=10900&r2=10901&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_noe.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_noe.py Wed Feb 24 06:09:15 2010
@@ -495,7 +495,7 @@
         sys.stderr = redir
 
         # Print a header in the controller.
-        header = 'Starting %s calculation' % self.label
+        header = 'Starting NOE calculation'
         underline = '-' * len(header)
         wx.CallAfter(self.gui.controller.log_panel.AppendText, 
(header+'\n\n'))
         time.sleep(0.5)
@@ -504,7 +504,7 @@
         data = self.assemble_data()
 
         # Execute.
-        Relax_fit(seq_args=data.seq_args, 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)
+        NOE_calc(pipe_name='noe', noe_ref = data.ref_file, noe_ref_rmsd = 
data.ref_rmsd, noe_sat = data.sat_file, noe_sat_rmsd = data.sat_rmsd, freq = 
data.frq, unresolved = data.unresolved, pdb_file = data.structure_file, 
results_folder = data.save_dir, int_method='height', mc_num=500)
 
 
     def link_data(self, data):