r4842 - in /1.3/maths_fns: jw_mapping.py jw_mf.py -- January 17, 2008 - 21:53

Author: semor
Date: Thu Jan 17 21:53:51 2008
New Revision: 4842

URL: http://svn.gna.org/viewcvs/relax?rev=4842&view=rev
Log:
Finished the conversion of maths_fns modules from Numeric to numpy.


Modified:
    1.3/maths_fns/jw_mapping.py
    1.3/maths_fns/jw_mf.py

Modified: 1.3/maths_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/jw_mapping.py?rev=4842&r1=4841&r2=4842&view=diff
==============================================================================
--- 1.3/maths_fns/jw_mapping.py (original)
+++ 1.3/maths_fns/jw_mapping.py Thu Jan 17 21:53:51 2008
@@ -21,8 +21,8 @@
 
###############################################################################
 
 # Python module imports.
+from math import pi
 from numpy import float64, zeros
-from math import pi
 
 # relax module imports.
 from ri_comps import calc_fixed_csa, calc_fixed_dip, comp_csa_const_func, 
comp_dip_const_func

Modified: 1.3/maths_fns/jw_mf.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/jw_mf.py?rev=4842&r1=4841&r2=4842&view=diff
==============================================================================
--- 1.3/maths_fns/jw_mf.py (original)
+++ 1.3/maths_fns/jw_mf.py Thu Jan 17 21:53:51 2008
@@ -34,7 +34,7 @@
 
     Data structure:  data.jw
     Dimension:  2D, (number of NMR frequencies, 5 spectral density 
frequencies)
-    Type:  Numeric matrix, Float64
+    Type:  numpy matrix, float64
     Dependencies:  None
     Required by:  data.ri, data.dri, data.d2ri
 
@@ -254,7 +254,7 @@
     Data structure:  data.djw
     Dimension:  3D, (number of NMR frequencies, 5 spectral density 
frequencies,
         model-free parameters)
-    Type:  Numeric 3D matrix, Float64
+    Type:  numpy 3D matrix, float64
     Dependencies:  None
     Required by:  data.dri, data.d2ri
 
@@ -1208,7 +1208,7 @@
     Data structure:  data.d2jw
     Dimension:  4D, (number of NMR frequencies, 5 spectral density 
frequencies, model-free
         parameters, model-free parameters)
-    Type:  Numeric 4D matrix, Float64
+    Type:  numpy 4D matrix, float64
     Dependencies:  None
     Required by:  data.d2ri