Changeset 1295 for trunk/python

Timestamp:

11/06/06 22:22:03 (18 years ago)

Author:

mar637

Message:

merge form Release2.1.1 branch

Location:

trunk/python

Files:

• __init__.py (modified) (5 diffs)
• asapfitter.py (modified) (4 diffs)
• asapplotter.py (modified) (1 diff)
• scantable.py (modified) (5 diffs)

trunk/python/__init__.py

@@ -253 +253 @@
     rcParams.update(rcParamsDefault)
 
+def _n_bools(n, val):
+    return [ val for i in xrange(n) ] 
 
 def _is_sequence_or_number(param, ptype=int):
@@ -298 +300 @@
         'data/Sgr_86p262_best_SPC.sdfits']
     """
-    import os
     if not os.path.isdir(path):
         return None
-    valid = "rpf sdf sdfits mbf asap".split()
+    valid = "rpf rpf.1 rpf.2 sdf sdfits mbf asap".split()
     if not suffix in valid:
         return None
@@ -325 +326 @@
     return
 
-try:
-    import numpy.core as NUM
-except ImportError:
-    try:
-        import numarray as NUM
-    except ImportError:
-        raise ImportError("You need to have numpy or numarray installed")
+def mask_and(a, b):
+    assert(len(a)==len(b))
+    return [ a[i] & b[i] for i in xrange(len(a)) ]
+
+def mask_or(a, b):
+    assert(len(a)==len(b))
+    return [ a[i] | b[i] for i in xrange(len(a)) ]
+
+def mask_not(a):
+    return [ not i for i in a ]
 
 from asapfitter import fitter
@@ -342 +346 @@
 from linecatalog import linecatalog
 
-mask_and = NUM.logical_and
-mask_or = NUM.logical_or
-mask_not = NUM.logical_not
-
 if rcParams['useplotter']:
-    from  asapplotter import asapplotter
-    gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
-    if gui:
-        import pylab as xyplotter
-    plotter = asapplotter(gui)
-    del gui
+    try:
+        from  asapplotter import asapplotter
+        gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
+        if gui:
+            import pylab as xyplotter
+            plotter = asapplotter(gui)
+            del gui
+    except ImportError:
+        print "Matplotlib not installed. No plotting available"
 
 __date__ = '$Date$'.split()[1]
@@ -362 +365 @@
     def version(): print  "ASAP %s(%s)"% (__version__, __date__)
     def list_scans(t = scantable):
-        import sys, types
+        import types
         globs = sys.modules['__main__'].__dict__.iteritems()
         print "The user created scantables are:"

trunk/python/asapfitter.py

@@ -2 +2 @@
 from asap import rcParams
 from asap import print_log
-from asap import NUM
+from asap import _n_bools
 
 class fitter:
@@ -42 +42 @@
         self.y = ydat
         if mask == None:
-            self.mask = NUM.ones(len(xdat))
+            self.mask = _n_bools(len(xdat), True)
         else:
             self.mask = mask
@@ -65 +65 @@
         self.mask = None
         if mask is None:
-            self.mask = NUM.ones(self.data.nchan())
+            self.mask = _n_bools(self.data.nchan(), True)
         else:
             self.mask = mask
@@ -215 +215 @@
         if self.fitfunc == "gauss" and component is not None:
             if not self.fitted and sum(self.fitter.getparameters()) == 0:
-                pars = list(NUM.zeros(len(self.components)*3))
-                fxd = list(NUM.zeros(len(pars)))
+                pars = _n_bools(len(self.components)*3, False)
+                fxd = _n_bools(len(pars), False)
             else:
                 pars = list(self.fitter.getparameters())

trunk/python/asapplotter.py

@@ -1 +1 @@
 from asap import rcParams, print_log, selector
-from asap import NUM
 import matplotlib.axes
 import sre

trunk/python/scantable.py

@@ -4 +4 @@
 from asap import asaplog
 from asap import selector
-from asap import NUM
 from asap import linecatalog
+from asap import _n_bools, mask_not, mask_and, mask_or
 
 class scantable(Scantable):
@@ -345 +345 @@
             print "--------------------------------------------------"
             print out
-            return
-        else:
-            retval = { 'axesnames': ['scanno', 'beamno', 'ifno', 'polno', 'cycleno'],
-                       'axes' : axes,
-                       'data': statvals}
-            return retval
+        #else:
+            #retval = { 'axesnames': ['scanno', 'beamno', 'ifno', 'polno', 'cycleno'],
+            #           'axes' : axes,
+            #           'data': statvals}
+        return statvals
 
     def stddev(self, mask=None):
@@ -721 +720 @@
             asaplog.push(msg)
         n = self.nchan()
-        msk = NUM.zeros(n)
+        msk = _n_bools(n, False)
         # test if args is a 'list' or a 'normal *args - UGLY!!!
 
@@ -731 +730 @@
             for i in range(n):
                 if data[i] >= window[0] and data[i] <= window[1]:
-                    msk[i] = 1
+                    msk[i] = True
         if kwargs.has_key('invert'):
             if kwargs.get('invert'):
-                msk = NUM.logical_not(msk)
+                msk = mask_not(msk)
         print_log()
         return msk
@@ -1202 +1201 @@
         varlist = vars()
         if mask is None:
-            mask = list(NUM.ones(self.nchan(-1)))
+            mask = [True for i in xrange(self.nchan(-1))]
         from asap.asapfitter import fitter
         try: