Ignore:
Timestamp:
12/14/06 11:21:48 (17 years ago)
Author:
mar637
Message:

merge from trunk, to get binary operator changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/Release2.1.2/python/scantable.py

    r1295 r1310  
    14131413            return s
    14141414
    1415     def scale(self, factor, tsys=True, insitu=None, ):
     1415    def scale(self, factor, tsys=True, insitu=None):
    14161416        """
    14171417        Return a scan where all spectra are scaled by the give 'factor'
    … …  
    15191519        s = None
    15201520        if isinstance(other, scantable):
    1521             print "scantable + scantable NYI"
    1522             return
     1521            s = scantable(self._math._binaryop(self, other, "ADD"))
    15231522        elif isinstance(other, float):
    15241523            s = scantable(self._math._unaryop(self, other, "ADD", False))
    … …  
    15361535        s = None
    15371536        if isinstance(other, scantable):
    1538             print "scantable - scantable NYI"
    1539             return
     1537            s = scantable(self._math._binaryop(self, other, "SUB"))
    15401538        elif isinstance(other, float):
    15411539            s = scantable(self._math._unaryop(self, other, "SUB", False))
    … …  
    15531551        s = None
    15541552        if isinstance(other, scantable):
    1555             print "scantable * scantable NYI"
    1556             return
     1553            s = scantable(self._math._binaryop(self, other, "MUL"))
    15571554        elif isinstance(other, float):
    15581555            s = scantable(self._math._unaryop(self, other, "MUL", False))
    … …  
    15711568        s = None
    15721569        if isinstance(other, scantable):
    1573             print "scantable / scantable NYI"
    1574             return
     1570            s = scantable(self._math._binaryop(self, other, "DIV"))
    15751571        elif isinstance(other, float):
    15761572            if other == 0.0:
Note: See TracChangeset for help on using the changeset viewer.