r14186 - in /branches/gui_testing: ./ auto_analyses/dauvergne_protocol.py -- August 05, 2011 - 15:58

Author: bugman
Date: Fri Aug  5 15:58:41 2011
New Revision: 14186

URL: http://svn.gna.org/viewcvs/relax?rev=14186&view=rev
Log:
Merged revisions 14185 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r14185 | bugman | 2011-08-05 15:50:37 +0200 (Fri, 05 Aug 2011) | 5 lines
  
  Fix for the round determination in the dauvergne_protocol auto-analysis.
  
  The 'opt' directory was missing in the path.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/auto_analyses/dauvergne_protocol.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug  5 15:58:41 2011
@@ -1,1 +1,1 @@
-/1.3:1-14182
+/1.3:1-14185

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=14186&r1=14185&r2=14186&view=diff
==============================================================================
--- branches/gui_testing/auto_analyses/dauvergne_protocol.py (original)
+++ branches/gui_testing/auto_analyses/dauvergne_protocol.py Fri Aug  5 
15:58:41 2011
@@ -486,7 +486,7 @@
             complete_round = i
 
             # The file root.
-            file_root = self.results_dir + sep + model + sep + "round_%i" %i 
+ sep + 'results'
+            file_root = self.results_dir + sep + model + sep + "round_%i" % 
i + sep + 'opt' + sep + 'results'
 
             # Stop looping when the opt/results file is found.
             if access(file_root + '.bz2', F_OK):