Changeset 1938 for trunk


Ignore:
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:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Makefile

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/SConstruct

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/apps

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/external-alma

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/external-alma/atnf/pks/pks_maths.cc

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/getsvnrev.sh

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/python

  • trunk/python/asapfitter.py

    r1927 r1938  
    8787        if kwargs.has_key('poly'):
    8888            self.fitfunc = 'poly'
     89            self.fitfuncs = ['poly']
    8990            n = kwargs.get('poly')
    90             self.components = [n]
     91            self.components = [n+1]
    9192            self.uselinear = False
    9293        elif kwargs.has_key('lpoly'):
    9394            self.fitfunc = 'poly'
     95            self.fitfuncs = ['lpoly']
    9496            n = kwargs.get('lpoly')
    95             self.components = [n]
     97            self.components = [n+1]
    9698            self.uselinear = True
    9799        elif kwargs.has_key('gauss'):
  • trunk/python/scantable.py

    r1931 r1938  
    377377
    378378    def set_spectrum(self, spec, rowno):
    379         """Return the spectrum for the current row in the scantable as a list.
     379        """Set the spectrum for the current row in the scantable.
    380380
    381381        Parameters:
     
    738738        """\
    739739        Get a list of time stamps for the observations.
    740         Return a datetime object for each integration time stamp in the scantable.
     740        Return a datetime object or a string (default) for each
     741        integration time stamp in the scantable.
    741742
    742743        Parameters:
     
    12841285        """\
    12851286        Set or replace the restfrequency specified and
    1286         If the 'freqs' argument holds a scalar,
     1287        if the 'freqs' argument holds a scalar,
    12871288        then that rest frequency will be applied to all the selected
    12881289        data.  If the 'freqs' argument holds
     
    14341435                out += "Function: %s\n  Parameters:" % (func)
    14351436                for i in items:
     1437                    if i == '':
     1438                        continue
    14361439                    s = i.split("=")
    14371440                    out += "\n   %s = %s" % (s[0], s[1])
     
    23062309        """\
    23072310
    2308         Return a scan where all spectra are scaled by the give 'factor'
     2311        Return a scan where all spectra are scaled by the given 'factor'
    23092312
    23102313        Parameters:
  • trunk/src

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/src/SConscript

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.