Author: bugman Date: Tue Aug 26 17:31:19 2014 New Revision: 25299 URL: http://svn.gna.org/viewcvs/relax?rev=25299&view=rev Log: The frame order auto-analysis now calls the time() user function. This is used at the start of each model section, as well as at the very start and very end of the analysis. This feedback is needed for the user to be able to optimise the optimisation settings. Modified: branches/frame_order_cleanup/auto_analyses/frame_order.py Modified: branches/frame_order_cleanup/auto_analyses/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/frame_order.py?rev=25299&r1=25298&r2=25299&view=diff ============================================================================== --- branches/frame_order_cleanup/auto_analyses/frame_order.py (original) +++ branches/frame_order_cleanup/auto_analyses/frame_order.py Tue Aug 26 17:31:19 2014 @@ -119,6 +119,9 @@ # Execute the full protocol. try: + # Output the starting time. + self.interpreter.time() + # The nested model optimisation protocol. self.nested_models() @@ -142,6 +145,9 @@ # Finish. self.interpreter.results.write(file='results', dir=self.results_dir+'final', force=True) + # Output the finishing time. + self.interpreter.time() + # Visualisation of the final results. self.visualisation(model='final') @@ -466,6 +472,9 @@ # Printout. section(file=sys.stdout, text="%s frame order model"%title, prespace=5) + # Output the model staring time. + self.interpreter.time() + # The data pipe name. self.pipe_name_dict[model] = '%s - %s' % (title, self.pipe_bundle) self.pipe_name_list.append(self.pipe_name_dict[model]) @@ -563,6 +572,9 @@ # Print out. section(file=sys.stdout, text="%s frame order model"%title, prespace=5) + + # Output the model staring time. + self.interpreter.time() # The data pipe name. self.pipe_name_dict[model] = '%s - %s' % (title, self.pipe_bundle)