Changeset 1059

Timestamp:

06/06/06 13:19:50 (18 years ago)

Author:

mar637

Message:

merge from Release2.0

Location:

trunk/python

Files:

• __init__.py (modified) (1 diff)
• asapmath.py (modified) (1 diff)
• asapreader.py (modified) (2 diffs)

trunk/python/__init__.py

@@ -307 +307 @@
 
 __date__ = '$Date$'.split()[1]
-__version__  = '2.0'
+__version__  = '2.0.1'
 
 if rcParams['verbose']:

trunk/python/asapmath.py

@@ -69 +69 @@
             alignedlst.append(scan.freq_align(refepoch,insitu=False))
     else:
-        aligendlst = lst
+        alignedlst = lst
     s = scantable(stm._average(alignedlst, mask, weight.upper(), scanav))
     s._add_history("average_time",varlist)

trunk/python/asapreader.py

@@ -6 +6 @@
     This class allows the user to import single dish files
     (rpfits,sdfits,ms).
-    The reader reads in integrations from the file and reamins at
+    The reader reads in integrations from the file and remains at
     the fileposition afterwards.
     Available functions are:
 
-    read(integrations)
-    summary    CURRENTLY DISABLED
+    read() # read until the (current) end of file)
 
     Example:
@@ -51 +50 @@
     def read(self):
         """
-        Reads in an returns a specified sequence of integrations.
-        If no list is given all integrations a read in.
+        Reads in all integrations in the data file.
         """
         from asap import scantable
         from asap import asaplog
-        if integrations is None:
-            integrations = [-1]
         asaplog.push("Reading integrations from disk...")
         stfiller._read(self)