Changeset 1739

Timestamp:

05/04/10 12:42:40 (14 years ago)

Author:

Malte Marquarding

Message:

Replace matplotlib.numerix with numpy

Location:

trunk/python

Files:

• __init__.py (modified) (2 diffs)
• asapfitter.py (modified) (1 diff)
• asaplotbase.py (modified) (2 diffs)
• asapplotter.py (modified) (4 diffs)

trunk/python/__init__.py

@@ -76 +76 @@
 
     """
-
     fname = os.path.join( os.getcwd(), '.asaprc')
     if os.path.exists(fname): return fname
@@ -453 +452 @@
             get_coordinate  - get the spectral coordinate for the given row,
                               which can be used for coordinate conversions
+            get_weather     - get the weather condition parameters
             get_unit        - get the current unit
             set_unit        - set the abcissa unit to be used from this

trunk/python/asapfitter.py

@@ -513 +513 @@
         xlab = 'Abcissa'
         ylab = 'Ordinate'
-        from matplotlib.numerix import ma,logical_not,logical_and,array
+        from numpy import ma,logical_not,logical_and,array
         m = self.mask
         if self.data:

trunk/python/asaplotbase.py

@@ -10 +10 @@
 from matplotlib.figure import Figure, Text
 from matplotlib.font_manager import FontProperties as FP
-from matplotlib.numerix import sqrt
+from numpy import sqrt
 from matplotlib import rc, rcParams
 from asap import rcParams as asaprcParams
@@ -145 +145 @@
         fmt is the line style as in plot().
         """
-        from matplotlib.numerix import array
-        from matplotlib.numerix.ma import MaskedArray
+        from numpy import array
+        from numpy.ma import MaskedArray
 
         if x is None:

trunk/python/asapplotter.py

@@ -548 +548 @@
         if not self._data.get_unit().endswith("Hz"):
             raise RuntimeError("Can only overlay linecatalogs when data is in frequency.")
-        from matplotlib.numerix import ma
+        from numpy import ma
         for j in range(len(self._plotter.subplots)):
             self._plotter.subplot(j)
@@ -767 +767 @@
                     y = scan._getspectrum(r)
                 m = scan._getmask(r)
-                from matplotlib.numerix import logical_not, logical_and
+                from numpy import logical_not, logical_and
                 if self._maskselection and len(self._usermask) == len(m):
                     if d[self._stacking](r) in self._maskselection[self._stacking]:
                         m = logical_and(m, self._usermask)
                 x = scan._getabcissa(r)
-                from matplotlib.numerix import ma, array
+                from numpy import ma, array
                 y = ma.masked_array(y,mask=logical_not(array(m,copy=False)))
                 if self._minmaxx is not None:
@@ -882 +882 @@
         from matplotlib.dates import HourLocator, MinuteLocator,SecondLocator, DayLocator
         from matplotlib.ticker import MultipleLocator
-        from matplotlib.numerix import array, pi
+        from numpy import array, pi
         dates = self._data.get_time(asdatetime=True)
         t = PL.date2num(dates)
@@ -940 +940 @@
         """
         from matplotlib import pylab as PL
-        from matplotlib.numerix import array
+        from numpy import array
         dir = array(self._data.get_directionval()).transpose()
         ra = dir[0]*180./pi