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

Author: bugman
Date: Wed Sep 17 17:11:30 2014
New Revision: 25873

URL: http://svn.gna.org/viewcvs/relax?rev=25873&view=rev
Log:
Updated the frame order count_sobol_points() function to handle the swapped 
axis order.

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=25873&r1=25872&r2=25873&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:30 2014
@@ -26,7 +26,7 @@
 from math import cos, pi
 from minfx.generic import generic_minimise
 from minfx.grid import grid_point_array
-from numpy import arccos, array, dot, float64, ones, swapaxes, zeros
+from numpy import arccos, array, dot, float64, ones, zeros
 from numpy.linalg import inv, norm
 from re import search
 import sys
@@ -99,13 +99,13 @@
     # Unpack the points.
     theta, phi, sigma, sigma2 = None, None, None, None
     if dims == ['theta', 'phi', 'sigma']:
-        theta, phi, sigma = swapaxes(target_fn.sobol_angles, 0, 1)
+        theta, phi, sigma = target_fn.sobol_angles
     elif dims == ['theta', 'phi']:
-        theta, phi = swapaxes(target_fn.sobol_angles, 0, 1)
+        theta, phi = target_fn.sobol_angles
     elif dims == ['sigma']:
-        sigma = swapaxes(target_fn.sobol_angles, 0, 1)[0]
+        sigma = target_fn.sobol_angles[0]
     elif dims == ['sigma', 'sigma2']:
-        sigma, sigma2 = swapaxes(target_fn.sobol_angles, 0, 1)
+        sigma, sigma2 = target_fn.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)
+    total_num = len(target_fn.sobol_angles[0])
     count = 0
     for i in range(total_num):
         # Pseudo-elliptic cone opening angle.