Changeset 1757 for branches/alma/python/__init__.py

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• python/__init__.py (modified) (21 diffs)

branches/alma/python/__init__.py

@@ -4 +4 @@
 """
 import os,sys,shutil, platform
+try:
+    from functools import wraps as wraps_dec
+except ImportError:
+    from asap.compatibility import wraps as wraps_dec
 
 # Set up CASAPATH and first time use of asap i.e. ~/.asap/*
@@ -33 +37 @@
     #shutil.copyfile(asapdata+"/data/ipythonrc-asap", userdir+"/ipythonrc-asap")
     # commented out by TT on 2009.06.23 for casapy use
-    ##shutil.copyfile(asapdata+"/data/ipy_user_conf.py", 
+    ##shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
     ##                userdir+"/ipy_user_conf.py")
     f = file(userdir+"/asapuserfuncs.py", "w")
@@ -43 +47 @@
     # upgrade to support later ipython versions
     ##if not os.path.exists(userdir+"/ipy_user_conf.py"):
-    ##    shutil.copyfile(asapdata+"/data/ipy_user_conf.py", 
+    ##    shutil.copyfile(asapdata+"/data/ipy_user_conf.py",
     ##                    userdir+"/ipy_user_conf.py")
 
@@ -74 +78 @@
 
     """
-
     fname = os.path.join( os.getcwd(), '.asaprc')
     if os.path.exists(fname): return fname
@@ -109 +112 @@
     'plotter.histogram'  : [False, _validate_bool],
     'plotter.papertype'  : ['A4', str],
-    'plotter.xaxisformatting' : ['asap', str],
+    ## for older Matplotlib version
+    #'plotter.axesformatting' : ['mpl', str],
+    'plotter.axesformatting' : ['asap', str],
 
     # scantable
@@ -118 +123 @@
     'scantable.storage'   : ['memory', str],
     'scantable.history'   : [True, _validate_bool],
-    'scantable.reference'      : ['.*(e|w|_R)$', str]
+    'scantable.reference'      : ['.*(e|w|_R)$', str],
+    'scantable.parallactify'   : [False, _validate_bool]
     # fitter
     }
@@ -146 +152 @@
 plotter.panelling          : scan
 
-# push panels together, to share axislabels
+# push panels together, to share axis labels
 plotter.ganged             : True
 
@@ -164 +170 @@
 
 # The formatting style of the xaxis
-plotter.xaxisformatting    : 'asap' or 'mpl'
+plotter.axesformatting    : 'mpl' (default) or 'asap' (for old versions of matplotlib)
 
 # scantable
@@ -189 +195 @@
 # Control the identification of reference (off) scans
 # This is has to be a regular expression
-scantable.reference         : .*(e|w|_R)$
+scantable.reference        : .*(e|w|_R)$
+
+# Indicate whether the data was parallactified (total phase offest == 0.0)
+scantable.parallactify     : False
+
 # Fitter
 """
@@ -290 +300 @@
 
 def _n_bools(n, val):
-    return [ val for i in xrange(n) ] 
+    return [ val for i in xrange(n) ]
 
 def _is_sequence_or_number(param, ptype=int):
@@ -357 +367 @@
     asaplog.disable()
 
+
+def print_log_dec(f):
+    @wraps_dec(f)
+    def wrap_it(*args, **kw):
+        val = f(*args, **kw)
+        print_log()
+        return val
+    return wrap_it
+
 def print_log(level='INFO'):
     from taskinit import casalog
@@ -382 +401 @@
 from scantable import scantable
 from asaplinefind import linefinder
+from simplelinefinder import simplelinefinder
 from linecatalog import linecatalog
 from interactivemask import interactivemask
+from opacity import skydip
+from opacity import model as opacity_model
 
 if rcParams['useplotter']:
@@ -392 +414 @@
             import matplotlib
             if not matplotlib.sys.modules['matplotlib.backends']: matplotlib.use("TkAgg")
-        import pylab
+        from matplotlib import pylab
         xyplotter = pylab
         plotter = asapplotter(gui)
@@ -402 +424 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = '2.3.1 alma'
+__version__  = '3.0.0 alma'
 # nrao casapy specific, get revision number
 #__revision__ = ' unknown '
@@ -427 +449 @@
 
 def is_ipython():
-    return '__IP' in dir(sys.modules["__main__"])
+    return 'IPython' in sys.modules.keys()
 if is_ipython():
     def version(): print  "ASAP %s(%s)"% (__version__, __date__)
+
     def list_scans(t = scantable):
-        import types
-        globs = sys.modules['__main__'].__dict__.iteritems()
-        print "The user created scantables are:"
-        sts = map(lambda x: x[0], filter(lambda x: isinstance(x[1], t), globs))
-        print filter(lambda x: not x.startswith('_'), sts)
-        return
+        import inspect
+        print "The user created scantables are: ",
+        globs=inspect.currentframe().f_back.f_locals.copy()
+        out = [ k for k,v in globs.iteritems() \
+                     if isinstance(v, scantable) and not k.startswith("_") ]
+        print out
+        return out
 
     def commands():
@@ -462 +486 @@
             get_elevation   - get the elevation of the scans
             get_parangle    - get the parallactic angle of the scans
+            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
@@ -506 +533 @@
             mx_quotient     - Form a quotient using MX data (off beams)
             scale, *, /     - return a scan scaled by a given factor
-            add, +, -       - return a scan with given value added
+            add, +          - return a scan with given value added
+            sub, -          - return a scan with given value subtracted
             bin             - return a scan with binned channels
             resample        - return a scan with resampled channels
@@ -529 +557 @@
             stddev          - Determine the standard deviation of the current
                               beam/if/pol
+            get_row_selector - get the selection object for a specified row
+                               number
      [Selection]
          selector              - a selection object to set a subset of a scantable
@@ -590 +620 @@
             plot            - plot a scantable
             plot_lines      - plot a linecatalog overlay
+            plotazel        - plot azimuth and elevation versus time
+            plotpointing    - plot telescope pointings
             save            - save the plot to a file ('png' ,'ps' or 'eps')
             set_mode        - set the state of the plotter, i.e.
@@ -613 +645 @@
             axhline,axvline - draw horizontal/vertical lines
             axhspan,axvspan - draw horizontal/vertical regions
+            annotate        - draw an arrow with label
+            create_mask     - create a scnatble mask interactively
 
         xyplotter           - matplotlib/pylab plotting functions
-
-    [Reading files]
-        reader              - access rpfits/sdfits files
-            open            - attach reader to a file
-            close           - detach reader from file
-            read            - read in integrations
-            summary         - list info about all integrations
 
     [General]
         commands            - this command
         print               - print details about a variable
-        list_scans          - list all scantables created bt the user
+        list_scans          - list all scantables created by the user
         list_files          - list all files readable by asap (default rpf)
         del                 - delete the given variable from memory
@@ -639 +666 @@
         mask_not            - boolean operations on masks created with
                               scantable.create_mask
+        skydip              - gain opacity values from a sky dip observation
+        opacity_model       - compute opacities fro given frequencies based on
+                              atmospheric model
 
     Note: