r11443 - /1.3/maths_fns/frame_order_matrix_ops.py -- August 09, 2010 - 13:59

Author: bugman
Date: Mon Aug  9 13:59:55 2010
New Revision: 11443

URL: http://svn.gna.org/viewcvs/relax?rev=11443&view=rev
Log:
Shifted to using numpy.sinc() for the frame order equations.


Modified:
    1.3/maths_fns/frame_order_matrix_ops.py

Modified: 1.3/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/frame_order_matrix_ops.py?rev=11443&r1=11442&r2=11443&view=diff
==============================================================================
--- 1.3/maths_fns/frame_order_matrix_ops.py (original)
+++ 1.3/maths_fns/frame_order_matrix_ops.py Mon Aug  9 13:59:55 2010
@@ -25,7 +25,7 @@
 
 # Python module imports.
 from math import cos, pi, sin, sqrt
-from numpy import cross, dot, transpose
+from numpy import cross, dot, sinc, transpose
 from numpy.linalg import norm
 from scipy.integrate import quad
 
@@ -34,7 +34,7 @@
 from maths_fns import order_parameters
 from maths_fns.coord_transform import spherical_to_cartesian
 from maths_fns.kronecker_product import kron_prod, transpose_23
-from maths_fns.pseudo_ellipse import pec, sinc
+from maths_fns.pseudo_ellipse import pec
 from maths_fns.rotation_matrix import euler_to_R_zyz, two_vect_to_R
 
 
@@ -1088,8 +1088,8 @@
             matrix[i, j] = 0.0
 
     # Repetitive trig calculations.
-    sinc_smax = sinc(smax)
-    sinc_2smax = sinc(2.0*smax)
+    sinc_smax = sinc(smax/pi)
+    sinc_2smax = sinc(2.0*smax/pi)
     cos_tmax = cos(tmax)
     cos_tmax2 = cos_tmax**2