r14093 - in /branches/gui_testing: ./ auto_analyses/ -- August 03, 2011 - 21:27

Author: bugman
Date: Wed Aug  3 21:27:02 2011
New Revision: 14093

URL: http://svn.gna.org/viewcvs/relax?rev=14093&view=rev
Log:
The current analysis is stored by name in the status singleton when the 
exec_lock is on.


Modified:
    branches/gui_testing/auto_analyses/dauvergne_protocol.py
    branches/gui_testing/auto_analyses/noe.py
    branches/gui_testing/auto_analyses/relax_fit.py
    branches/gui_testing/auto_analyses/stereochem_analysis.py
    branches/gui_testing/status.py

Modified: branches/gui_testing/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/auto_analyses/dauvergne_protocol.py?rev=14093&r1=14092&r2=14093&view=diff
==============================================================================
--- branches/gui_testing/auto_analyses/dauvergne_protocol.py (original)
+++ branches/gui_testing/auto_analyses/dauvergne_protocol.py Wed Aug  3 
21:27:02 2011
@@ -140,7 +140,7 @@
         """
 
         # Execution lock.
-        status.exec_lock.acquire('auto dauvergne protocol')
+        status.exec_lock.acquire(pipe_name)
 
         # Store the args.
         self.pipe_name = pipe_name
@@ -200,6 +200,7 @@
         finally:
             # Finish and unlock execution.
             status.auto_analysis[self.pipe_name].fin = True
+            status.current_analysis = None
             status.exec_lock.release()
 
 
@@ -748,6 +749,7 @@
 
         # Initialise the status object for this auto-analysis.
         status.init_auto_analysis(self.pipe_name, type='dauvergne_protocol')
+        status.current_analysis = pipe_name
 
         # The global diffusion model.
         status.auto_analysis[self.pipe_name].diff_model = self.diff_model

Modified: branches/gui_testing/auto_analyses/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/auto_analyses/noe.py?rev=14093&r1=14092&r2=14093&view=diff
==============================================================================
--- branches/gui_testing/auto_analyses/noe.py (original)
+++ branches/gui_testing/auto_analyses/noe.py Wed Aug  3 21:27:02 2011
@@ -57,10 +57,11 @@
         """
 
         # Execution lock.
-        status.exec_lock.acquire('auto noe')
+        status.exec_lock.acquire(pipe_name)
 
         # Set up the analysis status object.
         status.init_auto_analysis(pipe_name, type='noe')
+        status.current_analysis = pipe_name
 
         # Store the args.
         self.save_state = save_state
@@ -89,6 +90,7 @@
 
         # Finish and unlock execution.
         status.auto_analysis[self.pipe_name].fin = True
+        status.current_analysis = None
         status.exec_lock.release()
 
 

Modified: branches/gui_testing/auto_analyses/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/auto_analyses/relax_fit.py?rev=14093&r1=14092&r2=14093&view=diff
==============================================================================
--- branches/gui_testing/auto_analyses/relax_fit.py (original)
+++ branches/gui_testing/auto_analyses/relax_fit.py Wed Aug  3 21:27:02 2011
@@ -60,10 +60,11 @@
         """
 
         # Execution lock.
-        status.exec_lock.acquire('auto relax fit')
+        status.exec_lock.acquire(pipe_name)
 
         # Set up the analysis status object.
         status.init_auto_analysis(pipe_name, type='relax_fit')
+        status.current_analysis = pipe_name
 
         # Store the args.
         self.pipe_name = pipe_name
@@ -94,6 +95,7 @@
 
         # Finish and unlock execution.
         status.auto_analysis[self.pipe_name].fin = True
+        status.current_analysis = None
         status.exec_lock.release()
 
 

Modified: branches/gui_testing/auto_analyses/stereochem_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/auto_analyses/stereochem_analysis.py?rev=14093&r1=14092&r2=14093&view=diff
==============================================================================
--- branches/gui_testing/auto_analyses/stereochem_analysis.py (original)
+++ branches/gui_testing/auto_analyses/stereochem_analysis.py Wed Aug  3 
21:27:02 2011
@@ -145,6 +145,7 @@
 
         # Set up the analysis status object.
         status.init_auto_analysis('stereochem', type='stereochem')
+        status.current_analysis = 'auto stereochem analysis'
 
         # Store all the args.
         self.stage = stage
@@ -195,6 +196,7 @@
 
         # Finish and unlock execution.
         status.auto_analysis[self.pipe_name].fin = True
+        status.current_analysis = None
         status.exec_lock.release()
 
 

Modified: branches/gui_testing/status.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/status.py?rev=14093&r1=14092&r2=14093&view=diff
==============================================================================
--- branches/gui_testing/status.py (original)
+++ branches/gui_testing/status.py Wed Aug  3 21:27:02 2011
@@ -70,6 +70,7 @@
 
         # The auto-analysis status containers.
         self.auto_analysis = {}
+        self.current_analysis = None
 
         # Testing mode flag.
         self.test_mode = False