Changeset 2320 for trunk/python/scantable.py

Timestamp:

10/04/11 13:40:03 (13 years ago)

Author:

Malte Marquarding

Message:

Ticket #251: fixed copy of input scantable which breaks scantable selection

File:

• trunk/python/scantable.py (modified) (2 diffs)

trunk/python/scantable.py

@@ -575 +575 @@
                 for k in kw:
                     if k not in selector.fields:
-                        raise KeyError("Invalid selection key '%s', valid keys are %s" % (k, selector.fields))
+                        raise KeyError("Invalid selection key '%s', "
+                                       "valid keys are %s" % (k, 
+                                                              selector.fields))
                 selection = selector(**kw)
         self._setselection(selection)
@@ -3116 +3118 @@
         import numpy
         if isinstance(factor, list) or isinstance(factor, numpy.ndarray):
-            if isinstance(factor[0], list) or isinstance(factor[0], numpy.ndarray):
+            if isinstance(factor[0], list) or isinstance(factor[0], 
+                                                         numpy.ndarray):
                 from asapmath import _array2dOp
-                s = _array2dOp( self.copy(), factor, "MUL", tsys )
+                s = _array2dOp( self, factor, "MUL", tsys, insitu )
             else:
-                s = scantable( self._math._arrayop( self.copy(), factor, "MUL", tsys ) )
+                s = scantable( self._math._arrayop( self, factor, 
+                                                    "MUL", tsys ) )
         else:
-            s = scantable(self._math._unaryop(self.copy(), factor, "MUL", tsys))
+            s = scantable(self._math._unaryop(self, factor, "MUL", tsys))
         s._add_history("scale", varlist)
         if insitu: