Changeset 1938

Timestamp:

09/22/10 12:13:04 (14 years ago)

Author:

Malte Marquarding

Message:

merge from branches/asap4casa3.1.0. Should be done the other way

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/asapfitter.py (modified) (1 diff)
• python/scantable.py (modified) (5 diffs)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

trunk/python/asapfitter.py

@@ -87 +87 @@
         if kwargs.has_key('poly'):
             self.fitfunc = 'poly'
+            self.fitfuncs = ['poly']
             n = kwargs.get('poly')
-            self.components = [n]
+            self.components = [n+1]
             self.uselinear = False
         elif kwargs.has_key('lpoly'):
             self.fitfunc = 'poly'
+            self.fitfuncs = ['lpoly']
             n = kwargs.get('lpoly')
-            self.components = [n]
+            self.components = [n+1]
             self.uselinear = True
         elif kwargs.has_key('gauss'):

trunk/python/scantable.py

@@ -377 +377 @@
 
     def set_spectrum(self, spec, rowno):
-        """Return the spectrum for the current row in the scantable as a list.
+        """Set the spectrum for the current row in the scantable.
 
         Parameters:
@@ -738 +738 @@
         """\
         Get a list of time stamps for the observations.
-        Return a datetime object for each integration time stamp in the scantable.
+        Return a datetime object or a string (default) for each
+        integration time stamp in the scantable.
 
         Parameters:
@@ -1284 +1285 @@
         """\
         Set or replace the restfrequency specified and
-        If the 'freqs' argument holds a scalar,
+        if the 'freqs' argument holds a scalar,
         then that rest frequency will be applied to all the selected
         data.  If the 'freqs' argument holds
@@ -1434 +1435 @@
                 out += "Function: %s\n  Parameters:" % (func)
                 for i in items:
+                    if i == '':
+                        continue
                     s = i.split("=")
                     out += "\n   %s = %s" % (s[0], s[1])
@@ -2306 +2309 @@
         """\
 
-        Return a scan where all spectra are scaled by the give 'factor'
+        Return a scan where all spectra are scaled by the given 'factor'
 
         Parameters: