r12195 - /branches/bieri_gui/auto_analyses/dauvergne_protocol.py -- January 11, 2011 - 11:11

Author: bugman
Date: Tue Jan 11 11:11:54 2011
New Revision: 12195

URL: http://svn.gna.org/viewcvs/relax?rev=12195&view=rev
Log:
The status object is now in the module namespace and not in the class 
namespace!


Modified:
    branches/bieri_gui/auto_analyses/dauvergne_protocol.py

Modified: branches/bieri_gui/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/dauvergne_protocol.py?rev=12195&r1=12194&r2=12195&view=diff
==============================================================================
--- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original)
+++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Tue Jan 11 
11:11:54 2011
@@ -224,14 +224,14 @@
                 setattr(self.interpreter, name, user_fns[name])
 
         # Execution lock.
-        self.status.exec_lock.acquire('auto dauvergne protocol')
+        status.exec_lock.acquire('auto dauvergne protocol')
 
         # Execute the protocol.
         try:
             self.execute()
         finally:
             # Unlock execution.
-            self.status.exec_lock.release()
+            status.exec_lock.release()
 
 
     def check_vars(self):
@@ -562,7 +562,7 @@
             while True:
                 # Determine which round of optimisation to do (init, 
round_1, round_2, etc).
                 self.round = self.determine_rnd(model=self.diff_model)
-                self.status.dAuvergne_protocol.round = self.round
+                status.dAuvergne_protocol.round = self.round
 
                 # Inital round of optimisation for diffusion models MII to 
MV.
                 if self.round == 0:
@@ -649,7 +649,7 @@
                         break
 
                 # Unset the status.
-                self.status.dAuvergne_protocol.round = None
+                status.dAuvergne_protocol.round = None
 
 
         # Final run.
@@ -734,9 +734,9 @@
             raise RelaxError("Unknown diffusion model, change the value of 
'self.diff_model'")
 
         # Unset the status info.
-        self.status.dAuvergne_protocol.diff_model = None
-        self.status.dAuvergne_protocol.mf_models = None
-        self.status.dAuvergne_protocol.local_tm_models = None
+        status.dAuvergne_protocol.diff_model = None
+        status.dAuvergne_protocol.mf_models = None
+        status.dAuvergne_protocol.local_tm_models = None
 
 
     def load_tensor(self):