Changeset 1283 for tags/Release2.1.1b/python/__init__.py

Timestamp:

11/06/06 12:10:26 (18 years ago)

Author:

mar637

Message:

Fix for Ticket #88 - removed use of numpy/numarray except for plotting where it is used via matplotlib.numerix

File:

• tags/Release2.1.1b/python/__init__.py (modified) (4 diffs)

tags/Release2.1.1b/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):
@@ -301 +303 @@
     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 +327 @@
     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 +347 @@
 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]