r26453 - /branches/frame_order_cleanup/auto_analyses/frame_order.py -- November 07, 2014 - 18:19

Author: bugman
Date: Fri Nov  7 18:19:46 2014
New Revision: 26453

URL: http://svn.gna.org/viewcvs/relax?rev=26453&view=rev
Log:
Bug fix for the activation of quadratic integration in the frame order 
auto-analysis.

The calls to the frame_order.quad_int user function in the optimisation() 
method did not supply an
argument so the user function was defaulting to False rather than the True 
value required.


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=26453&r1=26452&r2=26453&view=diff
==============================================================================
--- branches/frame_order_cleanup/auto_analyses/frame_order.py   (original)
+++ branches/frame_order_cleanup/auto_analyses/frame_order.py   Fri Nov  7 
18:19:46 2014
@@ -1024,7 +1024,7 @@
             # The numerical optimisation settings.
             quad_int = opt.get_grid_quad_int(i)
             if quad_int:
-                self.interpreter.frame_order.quad_int()
+                self.interpreter.frame_order.quad_int(True)
                 intermediate_dir += '_quad_int'
             else:
                 sobol_num = opt.get_grid_sobol_info(i)
@@ -1050,7 +1050,7 @@
             # The numerical optimisation settings.
             quad_int = opt.get_min_quad_int(i)
             if quad_int:
-                self.interpreter.frame_order.quad_int()
+                self.interpreter.frame_order.quad_int(True)
                 intermediate_dir += '_quad_int'
             else:
                 sobol_num = opt.get_min_sobol_info(i)