Changeset 895 for trunk

Timestamp:

03/08/06 14:29:58 (19 years ago)

Author:

mar637

Message:

added asapreader to asap2

Location:

trunk

Files:

• python/__init__.py (modified) (3 diffs)
• python/asapreader.py (modified) (4 diffs)
• src/STFiller.cpp (modified) (1 diff)
• src/python_STFiller.cpp (modified) (1 diff)

trunk/python/__init__.py

@@ -68 +68 @@
     'scantable.autoaverage'      : [True, _validate_bool],
     'scantable.freqframe' : ['LSRK', str],  #default frequency frame
-    'scantable.allaxes'   : [True, _validate_bool],  # apply action to all axes
     'scantable.plotter'   : [True, _validate_bool], # use internal plotter
     'scantable.verbosesummary'   : [False, _validate_bool]
@@ -119 +118 @@
 # scantable.set_freqfrmae is called
 scantable.freqframe        : LSRK
-
-# apply action to all axes not just the cursor location
-scantable.allaxes          : True
-
-# use internal plotter
-scantable.plotter          : True
 
 # Control the level of information printed by summary
@@ -250 +243 @@
 
 from asapfitter import *
-#from asapreader import reader
+from asapreader import reader
 
 from asapmath import *

trunk/python/asapreader.py

@@ -1 @@
-from asap._asap import sdreader
+from asap._asap import stfiller
 from asap import print_log
 
-class reader(sdreader):
+class reader(stfiller):
     """
     This class allows the user to import single dish files
@@ -46 +46 @@
         from os.path import expandvars
         filename = expandvars(filename)
-        sdreader.__init__(self, filename, theif, thebeam)
+        stfiller.__init__(self, filename, theif, thebeam)
         print_log()
 
-    def read(self,integrations=None):
+    def read(self):
         """
         Reads in an returns a specified sequence of integrations.
         If no list is given all integrations a read in.
-        Parameters:
-            integrations:    a 'range' of integration numbers, e.g.
-                             range(100) or [0,1,2,3,4,10,11,100]
-                             If not given (default) all integrations
-                             are read in
-        Example:
-            r.read([0,1,2,3,4])    # reads in the first 5 integatrions
-                                   # NOT scans
-            r.read(range(100))     # read in the first 100 integrations
         """
         from asap import scantable
@@ -68 +59 @@
             integrations = [-1]
         asaplog.push("Reading integrations from disk...")
-        sdreader._read(self,integrations)
-        tbl = sdreader._getdata(self)
-        sdreader._reset(self) # reset to the beginning of the file
+        stfiller._read(self)
+        tbl = stfiller._getdata(self)
         if self.unit is not None:
             tbl.set_fluxunit(self.unit)
         print_log()
         return scantable(tbl)
+
+    def close(self):
+        """
+        Close the reader.
+        """
+        self._close()
 
     def summary(self, name=None):
@@ -85 +81 @@
              r.summary()
         """
-        sdreader._reset(self)
-        sdreader._read(self,[-1])
+        stfiller._read(self)
         from asap import scantable
-        tbl = scantable(sdreader._getdata(self))
-        sdreader._reset(self)
+        tbl = scantable(stfiller._getdata(self))
         tbl.summary(name)
+        del tbl
         return

trunk/src/STFiller.cpp

@@ -328 +328 @@
     throw(AipsError("Reading error occured, data possibly corrupted."));
   }
-
   return status;
 }

trunk/src/python_STFiller.cpp

@@ -43 +43 @@
         .def("_open", &STFillerWrapper::open)
         .def("_read", &STFillerWrapper::read)
+        .def("_close", &STFillerWrapper::close)
         .def("_getdata", &STFillerWrapper::getScantable)
       ;