Changeset 928 for trunk

Timestamp:

03/24/06 13:41:27 (19 years ago)

Author:

mar637

Message:

re-enabled plotter; added new utility function _to_list(); added empty lists as valid in _is_sequence_or_number; removed scantable.plotter as it is redundant.

File:

• trunk/python/__init__.py (modified) (4 diffs)

trunk/python/__init__.py

@@ -68 +68 @@
     'scantable.autoaverage'      : [True, _validate_bool],
     'scantable.freqframe' : ['LSRK', str],  #default frequency frame
-    'scantable.plotter'   : [True, _validate_bool], # use internal plotter
     'scantable.verbosesummary'   : [False, _validate_bool]
 
@@ -215 +214 @@
 def _is_sequence_or_number(param, ptype=int):
     if isinstance(param,tuple) or isinstance(param,list):
+        if len(param) == 0: return True # empty list
         out = True
         for p in param:
@@ -223 +223 @@
     return False
 
+def _to_list(param, ptype=int):
+    if isinstance(param, ptype):
+        if ptype is str: return param.split()
+        else: return [param]
+    if _is_sequence_or_number(param, ptype):
+        return param
+    return None
 
 # workaround for ipython, which redirects this if banner=0 in ipythonrc
@@ -254 +261 @@
 from numarray import logical_not as mask_not
 
-# if rcParams['useplotter']:
-#     from  asapplotter import *
-#     gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
-#     plotter = asapplotter(gui)
-#     del gui
+if rcParams['useplotter']:
+    from  asapplotter import *
+    gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
+    plotter = asapplotter(gui)
+    del gui
 
 __date__ = '$Date$'.split()[1]