r25832 - /branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py -- September 14, 2014 - 15:07

Author: bugman
Date: Sun Sep 14 15:07:22 2014
New Revision: 25832

URL: http://svn.gna.org/viewcvs/relax?rev=25832&view=rev
Log:
Fix for the frame_order.count_sobol_points user function for the rigid model.

This model is now caught at the start, a message printed out, and the 
function exited.


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=25832&r1=25831&r2=25832&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
(original)
+++ 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
Sun Sep 14 15:07:22 2014
@@ -59,7 +59,7 @@
     """
 
     # Printout.
-    print("Sobol' integration point counting for the current parameter 
values.")
+    print("Sobol' quasi-random integration point counting for the current 
parameter values.")
 
     # Checks.
     if not check_model(escalate=1):
@@ -67,6 +67,11 @@
     if not check_parameters(escalate=1):
         return
     if not check_domain(escalate=1):
+        return
+
+    # Handle the rigid model.
+    if cdp.model == MODEL_RIGID:
+        print("\nSobol' quasi-random integration points are not used for the 
rigid frame order model.")
         return
 
     # Set up the data structures for the target function.