r26086 - /branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py -- September 27, 2014 - 13:07

Author: bugman
Date: Sat Sep 27 13:07:48 2014
New Revision: 26086

URL: http://svn.gna.org/viewcvs/relax?rev=26086&view=rev
Log:
Fix for the frame order optimisation target setup printouts.

The 'Numerical integration: ' printout was fixed to 'Quasi-random Sobol' 
sequence'.  This now
changes to 'SciPy quadratic integration' if cdp.quad_int is set.  The text 
'PCS' has also been added
for clarification.


Modified:
    branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py

Modified: 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py?rev=26086&r1=26085&r2=26086&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
(original)
+++ 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
Sat Sep 27 13:07:48 2014
@@ -828,7 +828,10 @@
         if com != None:
             sys.stdout.write("The centre of mass reference coordinate for 
the rotor models is:\n    %s\n" % list(com))
         if cdp.model != MODEL_RIGID:
-            sys.stdout.write("Numerical integration:  Quasi-random Sobol' 
sequence.\n")
+            if hasattr(cdp, 'quad_int') and cdp.quad_int:
+                sys.stdout.write("Numerical PCS integration:  SciPy 
quadratic integration.\n")
+            else:
+                sys.stdout.write("Numerical PCS integration:  Quasi-random 
Sobol' sequence.\n")
         base_data = []
         if rdcs != None and len(rdcs):
             base_data.append("RDCs")