r11821 - in /1.3/auto_analyses: dauvergne_protocol.py noe.py relax_fit.py stereochem_analysis.py -- December 14, 2010 - 23:47

Author: bugman
Date: Tue Dec 14 23:47:33 2010
New Revision: 11821

URL: http://svn.gna.org/viewcvs/relax?rev=11821&view=rev
Log:
All of the auto-analyses now lock relax's execution while they are in 
operation.


Modified:
    1.3/auto_analyses/dauvergne_protocol.py
    1.3/auto_analyses/noe.py
    1.3/auto_analyses/relax_fit.py
    1.3/auto_analyses/stereochem_analysis.py

Modified: 1.3/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/auto_analyses/dauvergne_protocol.py?rev=11821&r1=11820&r2=11821&view=diff
==============================================================================
--- 1.3/auto_analyses/dauvergne_protocol.py (original)
+++ 1.3/auto_analyses/dauvergne_protocol.py Tue Dec 14 23:47:33 2010
@@ -200,6 +200,12 @@
         @type conv_loop:            bool
         """
 
+        # Initialise the status.
+        self.status = Status()
+
+        # Execution lock.
+        self.status.exec_lock.acquire('auto dauvergne protocol')
+
         # Store the args.
         self.diff_model = diff_model
         self.mf_models = mf_models
@@ -224,8 +230,7 @@
         # User variable checks.
         self.check_vars()
 
-        # Initialise the status.
-        self.status = Status()
+        # Some info for the status.
         self.status.dAuvergne_protocol.diff_model = diff_model
         self.status.dAuvergne_protocol.mf_models = mf_models
         self.status.dAuvergne_protocol.local_tm_models = local_tm_models
@@ -456,6 +461,9 @@
         self.status.dAuvergne_protocol.diff_model = None
         self.status.dAuvergne_protocol.mf_models = None
         self.status.dAuvergne_protocol.local_tm_models = None
+
+        # Unlock execution.
+        self.status.exec_lock.release()
 
 
     def check_vars(self):

Modified: 1.3/auto_analyses/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/auto_analyses/noe.py?rev=11821&r1=11820&r2=11821&view=diff
==============================================================================
--- 1.3/auto_analyses/noe.py (original)
+++ 1.3/auto_analyses/noe.py Tue Dec 14 23:47:33 2010
@@ -31,6 +31,7 @@
 # relax module imports.
 from prompt.interpreter import Interpreter
 import generic_fns.structure.main
+from status import Status
 
 
 
@@ -68,6 +69,12 @@
         @type heteronuc_pdb:    str
         """
 
+        # Initialise the status.
+        self.status = Status()
+
+        # Execution lock.
+        self.status.exec_lock.acquire('auto noe')
+
         # Store the args.
         self.pipe_name = pipe_name
         self.noe_sat = noe_sat
@@ -98,6 +105,9 @@
 
         # Execute.
         self.run()
+
+        # Unlock execution.
+        self.status.exec_lock.release()
 
 
     def run(self):

Modified: 1.3/auto_analyses/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/auto_analyses/relax_fit.py?rev=11821&r1=11820&r2=11821&view=diff
==============================================================================
--- 1.3/auto_analyses/relax_fit.py (original)
+++ 1.3/auto_analyses/relax_fit.py Tue Dec 14 23:47:33 2010
@@ -25,6 +25,7 @@
 
 # relax module imports.
 from prompt.interpreter import Interpreter
+from status import Status
 
 
 
@@ -46,6 +47,12 @@
         @type mc_num:           int
         """
 
+        # Initialise the status.
+        self.status = Status()
+
+        # Execution lock.
+        self.status.exec_lock.acquire('auto relax fit')
+
         # Store the args.
         self.pipe_name = pipe_name
         self.seq_args = seq_args
@@ -64,6 +71,9 @@
 
         # Execute.
         self.run()
+
+        # Unlock execution.
+        self.status.exec_lock.release()
 
 
     def run(self):

Modified: 1.3/auto_analyses/stereochem_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/auto_analyses/stereochem_analysis.py?rev=11821&r1=11820&r2=11821&view=diff
==============================================================================
--- 1.3/auto_analyses/stereochem_analysis.py (original)
+++ 1.3/auto_analyses/stereochem_analysis.py Tue Dec 14 23:47:33 2010
@@ -72,6 +72,7 @@
 from prompt.interpreter import Interpreter
 from relax_errors import RelaxError
 from relax_io import mkdir_nofail
+from status import Status
 
 
 
@@ -139,6 +140,12 @@
         @type upper_lim_rdc:        int
         """
 
+        # Initialise the status.
+        self.status = Status()
+
+        # Execution lock.
+        self.status.exec_lock.acquire('auto stereochem analysis')
+
         # Store all the args.
         self.stage = stage
         self.results_dir = results_dir
@@ -186,6 +193,9 @@
         if self.log:
             mkdir_nofail(self.results_dir + sep + "logs")
 
+        # Unlock execution.
+        self.status.exec_lock.release()
+
 
     def run(self):
         """Execute the given stage of the analysis."""