r11522 - /1.3/generic_fns/structure/cones.py -- August 17, 2010 - 16:18

Author: bugman
Date: Tue Aug 17 16:18:19 2010
New Revision: 11522

URL: http://svn.gna.org/viewcvs/relax?rev=11522&view=rev
Log:
Switched the names of the Pseudo_elliptic and Pseudo_elliptic2 classes.


Modified:
    1.3/generic_fns/structure/cones.py

Modified: 1.3/generic_fns/structure/cones.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/cones.py?rev=11522&r1=11521&r2=11522&view=diff
==============================================================================
--- 1.3/generic_fns/structure/cones.py (original)
+++ 1.3/generic_fns/structure/cones.py Tue Aug 17 16:18:19 2010
@@ -240,11 +240,11 @@
 
 
 class Pseudo_elliptic(Base):
-    """The class for the pseudo-elliptic cone.
-
-    This is not an elliptic cone!  The pseudo-ellipse is defined by::
-
-        phi_max^2 = phi_x^2 * cos(theta)^2  +  phi_y^2 * sin(theta)^2,
+    """The class for another pseudo-elliptic cone.
+
+    The pseudo-ellipse is defined by::
+
+        1/phi_max^2 = 1/phi_x^2 * cos(theta)^2  +  1/phi_y^2 * sin(theta)^2,
 
     where phi_max is the maximum polar angle for the given azimuthal angle 
theta, phi_x is the maximum cone angle along the x-eigenvector, and phi_y is 
that of the y-eigenvector.  The cone axis is assumed to be the z-axis.
     """
@@ -259,7 +259,7 @@
         """
 
         # Determine phi_max.
-        phi_max = sqrt((self._phi_x * cos(theta))**2 + (self._phi_y * 
sin(theta))**2)
+        phi_max = 1.0/sqrt(((1.0/self._phi_x) * cos(theta))**2 + 
((1.0/self._phi_y) * sin(theta))**2)
 
         # Return the limit.
         return phi_max
@@ -279,7 +279,7 @@
         """
 
         # The factor.
-        b = sqrt((phi**2 - self._phi_y**2)/(self._phi_x**2 - self._phi_y**2))
+        b = sqrt(((1.0/phi)**2 - (1.0/self._phi_y)**2) / 
((1.0/self._phi_x)**2 - (1.0/self._phi_y)**2))
 
         # The 4 quadrants.
         if theta_max < pi/2:
@@ -297,11 +297,11 @@
 
 
 class Pseudo_elliptic2(Base):
-    """The class for another pseudo-elliptic cone.
-
-    The pseudo-ellipse is defined by::
-
-        1/phi_max^2 = 1/phi_x^2 * cos(theta)^2  +  1/phi_y^2 * sin(theta)^2,
+    """The class for the pseudo-elliptic cone.
+
+    This is not an elliptic cone!  The pseudo-ellipse is defined by::
+
+        phi_max^2 = phi_x^2 * cos(theta)^2  +  phi_y^2 * sin(theta)^2,
 
     where phi_max is the maximum polar angle for the given azimuthal angle 
theta, phi_x is the maximum cone angle along the x-eigenvector, and phi_y is 
that of the y-eigenvector.  The cone axis is assumed to be the z-axis.
     """
@@ -316,7 +316,7 @@
         """
 
         # Determine phi_max.
-        phi_max = 1.0/sqrt(((1.0/self._phi_x) * cos(theta))**2 + 
((1.0/self._phi_y) * sin(theta))**2)
+        phi_max = sqrt((self._phi_x * cos(theta))**2 + (self._phi_y * 
sin(theta))**2)
 
         # Return the limit.
         return phi_max
@@ -336,7 +336,7 @@
         """
 
         # The factor.
-        b = sqrt(((1.0/phi)**2 - (1.0/self._phi_y)**2) / 
((1.0/self._phi_x)**2 - (1.0/self._phi_y)**2))
+        b = sqrt((phi**2 - self._phi_y**2)/(self._phi_x**2 - self._phi_y**2))
 
         # The 4 quadrants.
         if theta_max < pi/2: