r25875 - /branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py -- September 17, 2014 - 17:11

Author: bugman
Date: Wed Sep 17 17:11:33 2014
New Revision: 25875

URL: http://svn.gna.org/viewcvs/relax?rev=25875&view=rev
Log:
Updated the frame order count_sobol_points() function to use the new 
Sobol_data container.

The Sobol' sequence data generated by the target function is now located at
target_functions.frame_order.sobol_data.

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=25875&r1=25874&r2=25875&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
(original)
+++ 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
Wed Sep 17 17:11:33 2014
@@ -49,7 +49,7 @@
 from specific_analyses.frame_order.data import base_data_types, 
domain_moving, pivot_fixed, tensor_loop
 from specific_analyses.frame_order.parameters import assemble_param_vector, 
linear_constraints
 from specific_analyses.frame_order.variables import MODEL_DOUBLE_ROTOR, 
MODEL_FREE_ROTOR, MODEL_ISO_CONE, MODEL_ISO_CONE_FREE_ROTOR, 
MODEL_ISO_CONE_TORSIONLESS, MODEL_LIST_FREE_ROTORS, 
MODEL_LIST_PSEUDO_ELLIPSE, MODEL_PSEUDO_ELLIPSE, 
MODEL_PSEUDO_ELLIPSE_FREE_ROTOR, MODEL_PSEUDO_ELLIPSE_TORSIONLESS, 
MODEL_RIGID, MODEL_ROTOR
-from target_functions.frame_order import Frame_order
+from target_functions.frame_order import Frame_order, sobol_data
 
 
 def count_sobol_points(target_fn=None):
@@ -99,13 +99,13 @@
     # Unpack the points.
     theta, phi, sigma, sigma2 = None, None, None, None
     if dims == ['theta', 'phi', 'sigma']:
-        theta, phi, sigma = target_fn.sobol_angles
+        theta, phi, sigma = sobol_data.sobol_angles
     elif dims == ['theta', 'phi']:
-        theta, phi = target_fn.sobol_angles
+        theta, phi = sobol_data.sobol_angles
     elif dims == ['sigma']:
-        sigma = target_fn.sobol_angles[0]
+        sigma = sobol_data.sobol_angles[0]
     elif dims == ['sigma', 'sigma2']:
-        sigma, sigma2 = target_fn.sobol_angles
+        sigma, sigma2 = sobol_data.sobol_angles
 
     # Pseudo-ellipse.
     pe = False
@@ -128,7 +128,7 @@
         cone_theta = cdp.cone_theta
 
     # Loop over the Sobol' points to count them.
-    total_num = len(target_fn.sobol_angles[0])
+    total_num = len(sobol_data.sobol_angles[0])
     count = 0
     for i in range(total_num):
         # Pseudo-elliptic cone opening angle.