r25809 - /branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py -- September 12, 2014 - 17:35

Author: bugman
Date: Fri Sep 12 17:35:47 2014
New Revision: 25809

URL: http://svn.gna.org/viewcvs/relax?rev=25809&view=rev
Log:
Bug fix for the lib.frame_order.pseudo_ellipse.tmax_pseudo_ellipse_array() 
function.

The problem was that when theta_x or theta_y were zero, the floating point 
value of 0.0 would be
returned.  This is the incorrect behaviour as the returned value must be an 
array matching the
dimensions of the phi angle array argument.


Modified:
    branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py

Modified: branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py?rev=25809&r1=25808&r2=25809&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py      
(original)
+++ branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py      Fri 
Sep 12 17:35:47 2014
@@ -721,15 +721,15 @@
     @type theta_x:  float
     @param theta_y: The cone opening angle along y.
     @type theta_y:  float
-    @return:        The theta max angle for the given phi angle.
-    @rtype:         float
+    @return:        The array theta max angles for the given phi angle array.
+    @rtype:         numpy rank-1 float64 array
     """
 
     # Zero points.
     if theta_x == 0.0:
-        return 0.0
+        return 0.0 * phi
     elif theta_y == 0.0:
-        return 0.0
+        return 0.0 * phi
 
     # Return the maximum angle.
     return theta_x * theta_y / np_sqrt((np_cos(phi)*theta_y)**2 + 
(np_sin(phi)*theta_x)**2)