r16074 - /branches/uf_redesign/auto_analyses/dauvergne_protocol.py -- May 07, 2012 - 20:06

Author: bugman
Date: Mon May  7 20:06:58 2012
New Revision: 16074

URL: http://svn.gna.org/viewcvs/relax?rev=16074&view=rev
Log:
Fix for the dauvergne_protocol auto-analysis required by the recent changes 
to the minimise user function.


Modified:
    branches/uf_redesign/auto_analyses/dauvergne_protocol.py

Modified: branches/uf_redesign/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/auto_analyses/dauvergne_protocol.py?rev=16074&r1=16073&r2=16074&view=diff
==============================================================================
--- branches/uf_redesign/auto_analyses/dauvergne_protocol.py (original)
+++ branches/uf_redesign/auto_analyses/dauvergne_protocol.py Mon May  7 
20:06:58 2012
@@ -594,7 +594,7 @@
                     # Minimise just the diffusion tensor.
                     self.interpreter.fix('all_spins')
                     self.interpreter.grid_search(inc=inc)
-                    self.interpreter.minimise(self.min_algor, 
func_tol=self.opt_func_tol, max_iterations=self.opt_max_iterations)
+                    self.interpreter.minimise(self.min_algor, 
func_tol=self.opt_func_tol, max_iter=self.opt_max_iterations)
 
                     # Write the results.
                     self.interpreter.results.write(file='results', 
dir=self.base_dir, force=True)
@@ -618,7 +618,7 @@
                     self.interpreter.fix('all', fixed=False)
 
                     # Minimise all parameters.
-                    self.interpreter.minimise(self.min_algor, 
func_tol=self.opt_func_tol, max_iterations=self.opt_max_iterations)
+                    self.interpreter.minimise(self.min_algor, 
func_tol=self.opt_func_tol, max_iter=self.opt_max_iterations)
 
                     # Write the results.
                     dir = self.base_dir + 'opt'
@@ -698,7 +698,7 @@
             self.interpreter.monte_carlo.setup(number=self.mc_sim_num)
             self.interpreter.monte_carlo.create_data()
             self.interpreter.monte_carlo.initial_values()
-            self.interpreter.minimise(self.min_algor, 
func_tol=self.opt_func_tol, max_iterations=self.opt_max_iterations)
+            self.interpreter.minimise(self.min_algor, 
func_tol=self.opt_func_tol, max_iter=self.opt_max_iterations)
             self.interpreter.eliminate()
             self.interpreter.monte_carlo.error_analysis()
 
@@ -777,7 +777,7 @@
 
             # Minimise.
             self.interpreter.grid_search(inc=self.grid_inc)
-            self.interpreter.minimise(self.min_algor, 
func_tol=self.opt_func_tol, max_iterations=self.opt_max_iterations)
+            self.interpreter.minimise(self.min_algor, 
func_tol=self.opt_func_tol, max_iter=self.opt_max_iterations)
 
             # Model elimination.
             self.interpreter.eliminate()