Author: bugman Date: Fri Aug 5 15:44:33 2011 New Revision: 14183 URL: http://svn.gna.org/viewcvs/relax?rev=14183&view=rev Log: Merged revisions 14181 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r14181 | bugman | 2011-08-05 15:40:08 +0200 (Fri, 05 Aug 2011) | 5 lines Fix for the resetting of the global optimisation round in the dauvergne_protocol auto-analysis. The value was being reset to None at every round. ........ 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:44:33 2011 @@ -1,1 +1,1 @@ -/1.3:1-14179 +/1.3:1-14182 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=14183&r1=14182&r2=14183&view=diff ============================================================================== --- branches/gui_testing/auto_analyses/dauvergne_protocol.py (original) +++ branches/gui_testing/auto_analyses/dauvergne_protocol.py Fri Aug 5 15:44:33 2011 @@ -613,8 +613,8 @@ if converged or not self.conv_loop: break - # Unset the status. - status.auto_analysis[self.pipe_name].round = None + # Unset the status. + status.auto_analysis[self.pipe_name].round = None # Final run.