mailRe: r4821 - /1.3/maths_fns/jw_mapping.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by Edward d'Auvergne on January 17, 2008 - 16:31:
Thanks for making that change.  It might take a while to convert all
of relax from Numeric to numpy.  I just had a difficult problem today
with the conversion of the minfx project code (the old 'minimise'
directory).  The problem was with the take() function keyword argument
'axis' changing its default value (see
https://mail.gna.org/public/minfx-commits/2008-01/msg00005.html).
There was also a problem with the ones() function
(https://mail.gna.org/public/minfx-commits/2008-01/msg00004.html).  So
if you do make a change to numpy and things stop working, it's likely
to be a similar issue.

Regards,

Edward



On Jan 17, 2008 3:57 PM,  <sebastien.morin.1@xxxxxxxxx> wrote:
Author: semor
Date: Thu Jan 17 15:57:43 2008
New Revision: 4821

URL: http://svn.gna.org/viewcvs/relax?rev=4821&view=rev
Log:
Converted the maths_fns.jw_mapping module from Numeric to numpy.


Modified:
    1.3/maths_fns/jw_mapping.py

Modified: 1.3/maths_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/jw_mapping.py?rev=4821&r1=4820&r2=4821&view=diff
==============================================================================
--- 1.3/maths_fns/jw_mapping.py (original)
+++ 1.3/maths_fns/jw_mapping.py Thu Jan 17 15:57:43 2008
@@ -21,7 +21,7 @@
 
###############################################################################

 # Python module imports.
-from Numeric import Float64, zeros
+from numpy import float64, zeros
 from math import pi

 # relax module imports.
@@ -48,14 +48,14 @@
         self.data.dip_const_fixed = 0.0
         self.data.csa_const_fixed = [0.0]
         self.data.dip_const_func = 0.0
-        self.data.csa_const_func = zeros(1, Float64)
+        self.data.csa_const_func = zeros(1, float64)

         # Nuclear frequencies.
         frq = frq * 2 * pi
         frqX = frq * self.data.gx / self.data.gh

         # Calculate the five frequencies which cause R1, R2, and NOE 
relaxation.
-        self.data.frq_list = zeros((1, 5), Float64)
+        self.data.frq_list = zeros((1, 5), float64)
         self.data.frq_list[0, 1] = frqX
         self.data.frq_list[0, 2] = frq - frqX
         self.data.frq_list[0, 3] = frq


_______________________________________________
relax (http://nmr-relax.com)

This is the relax-commits mailing list
relax-commits@xxxxxxx

To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits




Related Messages


Powered by MHonArc, Updated Thu Jan 17 23:40:59 2008