r10334 - /branches/bieri_gui/gui_bieri/analyses/relax_control.py -- January 25, 2010 - 21:32

Author: bugman
Date: Mon Jan 25 21:32:46 2010
New Revision: 10334

URL: http://svn.gna.org/viewcvs/relax?rev=10334&view=rev
Log:
Bug fix for the thread execution.

'self' was being passed in as the last argument, but this is not how 
execution should occur.  Either
the data is directly passed in as args to start_model_free or this function 
is merged back into a
module for the automatic model-free protocol GUI elements.


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

Modified: branches/bieri_gui/gui_bieri/analyses/relax_control.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/relax_control.py?rev=10334&r1=10333&r2=10334&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/relax_control.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/relax_control.py Mon Jan 25 
21:32:46 2010
@@ -128,13 +128,13 @@
 
         # Start Calculation in Thread
         if WHICH_CALC == 'Rx':
-            thread.start_new_thread(make_rx, (PARAMETERS[0], PARAMETERS[1], 
PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5], PARAMETERS[6], 
PARAMETERS[7], PARAMETERS[8], PARAMETERS[9], PARAMETERS[10], PARAMETERS[11], 
PARAMETERS[12], self))
+            thread.start_new_thread(make_rx, (PARAMETERS[0], PARAMETERS[1], 
PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5], PARAMETERS[6], 
PARAMETERS[7], PARAMETERS[8], PARAMETERS[9], PARAMETERS[10], PARAMETERS[11], 
PARAMETERS[12]))
 
         if WHICH_CALC == 'Noe':
-            thread.start_new_thread(make_noe, (PARAMETERS[0], PARAMETERS[1], 
PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5], PARAMETERS[6], 
PARAMETERS[7], PARAMETERS[8], PARAMETERS[9], PARAMETERS[10], PARAMETERS[11], 
PARAMETERS[12], PARAMETERS[13], self))
+            thread.start_new_thread(make_noe, (PARAMETERS[0], PARAMETERS[1], 
PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5], PARAMETERS[6], 
PARAMETERS[7], PARAMETERS[8], PARAMETERS[9], PARAMETERS[10], PARAMETERS[11], 
PARAMETERS[12], PARAMETERS[13]))
 
         if WHICH_CALC == 'Model-free':
-            thread.start_new_thread(start_model_free, (PARAMETERS[0], 
PARAMETERS[1], PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5], 
self))
+            thread.start_new_thread(start_model_free, (PARAMETERS[0], 
PARAMETERS[1], PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5]))
 
 
     def __do_layout(self):