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

Timestamp:

07/18/09 06:35:47 (15 years ago)

Author:

TakTsutsumi

Message:

New Development: No, merge with asap2.3.1

JIRA Issue: Yes CAS-1450

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): single dish

Description: Upgrade of alma branch based on ASAP2.2.0

(rev.1562) to ASAP2.3.1 (rev.1561)

File:

• branches/alma/python/__init__.py (modified) (12 diffs)

branches/alma/python/__init__.py

@@ -32 +32 @@
     os.mkdir(userdir)
     #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", 
+    ##                userdir+"/ipy_user_conf.py")
     f = file(userdir+"/asapuserfuncs.py", "w")
     f.close()
     f = file(userdir+"/ipythonrc", "w")
     f.close()
+# commented out by TT on 2009.06.23 for casapy use
+##else:
+    # upgrade to support later ipython versions
+    ##if not os.path.exists(userdir+"/ipy_user_conf.py"):
+    ##    shutil.copyfile(asapdata+"/data/ipy_user_conf.py", 
+    ##                    userdir+"/ipy_user_conf.py")
+
 # remove from namespace
 del asapdata, userdir, shutil, platform
@@ -99 +109 @@
     'plotter.histogram'  : [False, _validate_bool],
     'plotter.papertype'  : ['A4', str],
+    'plotter.xaxisformatting' : ['asap', str],
 
     # scantable
@@ -105 +116 @@
     'scantable.freqframe' : ['LSRK', str],  #default frequency frame
     'scantable.verbosesummary'   : [False, _validate_bool],
-    'scantable.storage'   : ['memory', str]
+    'scantable.storage'   : ['memory', str],
+    'scantable.history'   : [True, _validate_bool],
+    'scantable.reference'      : ['.*(e|w|_R)$', str]
     # fitter
     }
@@ -136 +149 @@
 plotter.ganged             : True
 
-# decimate the number of points plotted bya afactor of
+# decimate the number of points plotted by a factor of
 # nchan/1024
 plotter.decimate           : False
@@ -150 +163 @@
 plotter.papertype          : A4
 
+# The formatting style of the xaxis
+plotter.xaxisformatting    : 'asap' or 'mpl'
+
 # scantable
 
 # default storage of scantable ('memory'/'disk')
 scantable.storage          : memory
+
+# write history of each call to scantable
+scantable.history          : True
+
 # default ouput format when saving
 scantable.save             : ASAP
+
 # auto averaging on read
 scantable.autoaverage      : True
@@ -166 +187 @@
 scantable.verbosesummary   : False
 
+# Control the identification of reference (off) scans
+# This is has to be a regular expression
+scantable.reference         : .*(e|w|_R)$
 # Fitter
 """
@@ -242 +266 @@
     for k,v in kwargs.items():
         name = aliases.get(k) or k
-        key = '%s.%s' % (group, name)
+        if len(group):
+            key = '%s.%s' % (group, name)
+        else:
+            key = name
         if not rcParams.has_key(key):
             raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' % (key, group, name))
@@ -352 +379 @@
 if rcParams['useplotter']:
     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
+        from asapplotter import asapplotter
+        gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
+        if gui:
+            import matplotlib
+            matplotlib.use("TkAgg")
+        import pylab
+        xyplotter = pylab
+        plotter = asapplotter(gui)
+        del gui
     except ImportError:
-        print "Matplotlib not installed. No plotting available"
+        print "Matplotlib not installed. No plotting available"
 
 __date__ = '$Date$'.split()[1]
-__version__  = '2.2.0 alma'
+__version__  = '2.3.1 alma'
 # nrao casapy specific, get revision number
 #__revision__ = ' unknown '
@@ -369 +399 @@
 if os.path.isfile(revinfo):
     f = file(revinfo)
-    f.readline()
+    #f.readline()
     revsionno=f.readline()
     f.close()
@@ -427 +457 @@
             get_fluxunit    - get the brightness flux unit
             set_fluxunit    - set the brightness flux unit
+            set_sourcetype  - set the type of the source - source or reference
             create_mask     - return an mask in the current unit
                               for the given region. The specified regions
@@ -432 +463 @@
             get_restfreqs   - get the current list of rest frequencies
             set_restfreqs   - set a list of rest frequencies
-            shift_refpix    - shift the reference pixel of the IFs
+            shift_refpix    - shift the reference pixel of the IFs
+            set_spectrum    - overwrite the spectrum for a given row
+            get_spectrum    - retrieve the spectrum for a given
+            get_mask        - retrieve the mask for a given
             flag            - flag selected channels in the data
             lag_flag        - flag specified frequency in the data
@@ -439 +473 @@
             nbeam,nif,nchan,npol - the number of beams/IFs/Pols/Chans
             nscan           - the number of scans in the scantable
-            nrow            - te number of spectra in the scantable
+            nrow            - the number of spectra in the scantable
             history         - print the history of the scantable
             get_fit         - get a fit which has been stored witnh the data