r11884 - /branches/bieri_gui/auto_analyses/dauvergne_protocol.py -- December 17, 2010 - 19:42

Author: bugman
Date: Fri Dec 17 19:42:13 2010
New Revision: 11884

URL: http://svn.gna.org/viewcvs/relax?rev=11884&view=rev
Log:
The dauvergne_protocol auto-analysis results can now be located in a 
directory other the cwd.

The getcwd() command was being used to determine if certain models had been 
previously optimised.
But if 'save_dir' had been set, then the results of these models would not be 
in the path of
getcwd().  This behaviour is now fixed.


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=11884&r1=11883&r2=11884&view=diff
==============================================================================
--- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original)
+++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Fri Dec 17 
19:42:13 2010
@@ -233,9 +233,9 @@
 
         # Project directory (i.e. directory containing the model-free model 
results and the newly generated files)
         if save_dir:
-            self.save_dir = save_dir+sep
+            self.save_dir = save_dir + sep
         else:
-            self.save_dir = ''
+            self.save_dir = getcwd()
 
         # User variable checks.
         self.check_vars()
@@ -290,7 +290,7 @@
 
         elif self.diff_model == 'sphere' or self.diff_model == 'prolate' or 
self.diff_model == 'oblate' or self.diff_model == 'ellipsoid':
             # No local_tm directory!
-            dir_list = listdir(getcwd())
+            dir_list = listdir(self.save_dir)
             if 'local_tm' not in dir_list:
                 raise RelaxError("The local_tm model must be optimised 
first.")
 
@@ -409,7 +409,7 @@
                     self.interpreter.pipe.delete(name)
 
             # Missing optimised model.
-            dir_list = listdir(getcwd())
+            dir_list = listdir(self.save_dir)
             for name in self.pipes:
                 if name not in dir_list:
                     raise RelaxError("The %s model must be optimised first." 
% name)
@@ -741,7 +741,7 @@
         try:
             # Files are in same directory / no directory specified
             if self.save_dir =='':
-                dir_list = listdir(getcwd()+sep+model)
+                dir_list = listdir(self.save_dir+sep+model)
 
             # Directory is specified
             else: