r20960 - /branches/relax_disp/specific_analyses/relax_disp/disp_data.py -- September 10, 2013 - 13:50

Author: bugman
Date: Tue Sep 10 13:50:03 2013
New Revision: 20960

URL: http://svn.gna.org/viewcvs/relax?rev=20960&view=rev
Log:
The return_cpmg_frqs() and return_spin_lock_nu1() functions now return numpy 
arrays.

These are functions from specific_analyses.relax_disp.disp_data.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=20960&r1=20959&r2=20960&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Tue Sep 10 
13:50:03 2013
@@ -34,7 +34,7 @@
 
 # Python module imports.
 from math import atan, pi, sqrt
-from numpy import float64, int32, ones, zeros
+from numpy import array, float64, int32, ones, zeros
 from random import gauss
 
 # relax module imports.
@@ -1099,7 +1099,7 @@
     @keyword ref_flag:  A flag which if False will cause the reference 
spectrum frequency of None to be removed from the list.
     @type ref_flag:     bool
     @return:            The list of nu_CPMG frequencies in Hz.
-    @rtype:             list of float
+    @rtype:             numpy rank-1 float64 array
     """
 
     # Initialise.
@@ -1114,7 +1114,7 @@
         cpmg_frqs.append(frq)
 
     # Return the new list.
-    return cpmg_frqs
+    return array(cpmg_frqs, float64)
 
 
 def return_index_from_disp_point(value, exp_type=None):
@@ -1548,7 +1548,7 @@
     @keyword ref_flag:  A flag which if False will cause the reference 
spectrum frequency of None to be removed from the list.
     @type ref_flag:     bool
     @return:            The list of spin-lock field strengths in Hz.
-    @rtype:             list of float
+    @rtype:             numpy rank-1 float64 array
     """
 
     # Initialise.
@@ -1563,7 +1563,7 @@
         nu1.append(frq)
 
     # Return the new list.
-    return nu1
+    return array(nu1, float64)
 
 
 def return_value_from_frq_index(frq_index=None):