Changeset 1843 for trunk/python

Timestamp:

08/04/10 12:31:09 (14 years ago)

Author:

Malte Marquarding

Message:

Ticket #192: enabling new filler. Get rid of unused asapreader.

Location:

trunk/python

Files:

• asapreader.py (deleted)
• scantable.py (modified) (10 diffs)

trunk/python/scantable.py

@@ -7 +7 @@
 from asap.env import is_casapy
 from asap._asap import Scantable
+from asap._asap import filler
 from asap.parameters import rcParams
 from asap.logging import asaplog, print_log, print_log_dec
@@ -53 +54 @@
                          The default (True) is taken from .asaprc.
             unit:         brightness unit; must be consistent with K or Jy.
-                         Over-rides the default selected by the reader
+                         Over-rides the default selected by the filler
                          (input rpfits/sdfits/ms) or replaces the value
                          in existing scantables
@@ -62 +63 @@
             antenna:     Antenna selection. integer (id) or string (name
                          or id).
-            parallactify: Indcicate that the data had been parallatified.
+            parallactify: Indicate that the data had been parallatified.
                           Default is taken form rc file.
         """
@@ -69 +70 @@
         if getpt is None:
             getpt = True
+        if antenna is not None:
+            asaplog.push("Antenna selection currently unsupported."
+                         "Using '0'")
+            print_log('WARN')
         if antenna is None:
             antenna = ''
         elif type(antenna) == int:
-            antenna = '%s'%antenna
+            antenna = '%s' % antenna
         elif type(antenna) == list:
             tmpstr = ''
@@ -914 +919 @@
         Flag the selected data in row-based manner.
         Parameters:
-            rows:   list of row numbers to be flagged. Default is no row (must be explicitly specified to execute row-based flagging).
+            rows:   list of row numbers to be flagged. Default is no row
+                    (must be explicitly specified to execute row-based flagging).
             unflag: if True, unflag the data.
         """
@@ -1597 +1603 @@
     def parallactify(self, pflag):
         """
-        Set a flag to inidcate whether this data should be treated as having
+        Set a flag to indicate whether this data should be treated as having
         been 'parallactified' (total phase == 0.0)
         Parameters:
-            pflag:  Bool inidcating whether to turn this on (True) or
+            pflag:  Bool indicating whether to turn this on (True) or
                     off (False)
         """
@@ -2361 +2367 @@
 
     def _fill(self, names, unit, average, getpt, antenna):
-        import os
-        from asap._asap import stfiller
         first = True
         fullnames = []
@@ -2372 +2376 @@
                 if rcParams['verbose']:
                     asaplog.push(msg)
-                    #print asaplog.pop().strip()
                     print_log( 'ERROR' )
                     return
@@ -2382 +2385 @@
         for name in fullnames:
             tbl = Scantable(stype)
-            r = stfiller(tbl)
+            r = filler(tbl)
             rx = rcParams['scantable.reference']
-            r._setreferenceexpr(rx)
+            r.setreferenceexpr(rx)
             msg = "Importing %s..." % (name)
             asaplog.push(msg, False)
             print_log()
-            r._open(name, antenna, -1, -1, getpt)
-            r._read()
+            r.open(name)# antenna, -1, -1, getpt)
+            r.fill()
             if average:
                 tbl = self._math._average((tbl, ), (), 'NONE', 'SCAN')
@@ -2395 +2398 @@
                 tbl = self._math._merge([self, tbl])
             Scantable.__init__(self, tbl)
-            r._close()
+            r.close()
             del r, tbl
             first = False