r4843 - in /1.3/dx: base_map.py isosurface_3D.py -- January 17, 2008 - 21:58

Author: semor
Date: Thu Jan 17 21:58:50 2008
New Revision: 4843

URL: http://svn.gna.org/viewcvs/relax?rev=4843&view=rev
Log:
Converted dx modules from Numeric to numpy.


Modified:
    1.3/dx/base_map.py
    1.3/dx/isosurface_3D.py

Modified: 1.3/dx/base_map.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/dx/base_map.py?rev=4843&r1=4842&r2=4843&view=diff
==============================================================================
--- 1.3/dx/base_map.py (original)
+++ 1.3/dx/base_map.py Thu Jan 17 21:58:50 2008
@@ -21,7 +21,7 @@
 
###############################################################################
 
 # Python module imports.
-from Numeric import Float64, array, zeros
+from numpy import float64, array, zeros
 from time import asctime, localtime
 
 # relax module imports.
@@ -299,13 +299,13 @@
 
         # Points.
         if point != None:
-            self.point = array(point, Float64)
+            self.point = array(point, float64)
             self.num_points = 1
         else:
             self.num_points = 0
 
         # Get the default map bounds.
-        self.bounds = zeros((self.n, 2), Float64)
+        self.bounds = zeros((self.n, 2), float64)
         for i in xrange(self.n):
             # Get the bounds for the parameter i.
             bounds = self.map_bounds[i](self.run, self.param_names[i])
@@ -319,14 +319,14 @@
 
         # Lower bounds.
         if lower != None:
-            self.bounds[:, 0] = array(lower, Float64)
+            self.bounds[:, 0] = array(lower, float64)
 
         # Upper bounds.
         if upper != None:
-            self.bounds[:, 1] = array(upper, Float64)
+            self.bounds[:, 1] = array(upper, float64)
 
         # Setup the step sizes.
-        self.step_size = zeros(self.n, Float64)
+        self.step_size = zeros(self.n, float64)
         self.step_size = (self.bounds[:, 1] - self.bounds[:, 0]) / self.inc
 
 

Modified: 1.3/dx/isosurface_3D.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/dx/isosurface_3D.py?rev=4843&r1=4842&r2=4843&view=diff
==============================================================================
--- 1.3/dx/isosurface_3D.py (original)
+++ 1.3/dx/isosurface_3D.py Thu Jan 17 21:58:50 2008
@@ -21,7 +21,7 @@
 
###############################################################################
 
 # Python module imports.
-from Numeric import Float64, zeros
+from numpy import float64, zeros
 
 # relax module imports.
 from data import Data as relax_data_store
@@ -73,7 +73,7 @@
         """Function for creating the text of a 3D map."""
 
         # Initialise.
-        values = zeros(3, Float64)
+        values = zeros(3, float64)
         percent = 0.0
         percent_inc = 100.0 / (self.inc + 1.0)**(self.n - 1.0)
         print "%-10s%8.3f%-1s" % ("Progress:", percent, "%")