Changeset 2320 for trunk

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

Location:

trunk/python

Files:

• asapmath.py (modified) (3 diffs)
• scantable.py (modified) (2 diffs)

trunk/python/asapmath.py

@@ -1012 +1012 @@
 
 @asaplog_post_dec
-def _array2dOp( scan, value, mode="ADD", tsys=False ):
+def _array2dOp( scan, value, mode="ADD", tsys=False, insitu=None):
     """
     This function is workaround on the basic operation of scantable
@@ -1024 +1024 @@
     nrow = scan.nrow()
     s = None
+    from asap._asap import stmath
+    stm = stmath()
+    stm._setinsitu(insitu)
     if len( value ) == 1:
-        from asap._asap import stmath
-        stm = stmath()
-        s = scantable( stm._arrayop( scan.copy(), value[0], mode, tsys ) )
-        del stm
+        s = scantable( stm._arrayop( scan, value[0], mode, tsys ) )
     elif len( value ) != nrow:
         raise ValueError( 'len(value) must be 1 or conform to scan.nrow()' )
     else:
         from asap._asap import stmath
-        stm = stmath()
-        # insitu must be True
+        if not insitu:
+            s = scan.copy()
+        else:
+            s = scan
+        # insitu must be True as we go row by row on the same data
         stm._setinsitu( True )
-        s = scan.copy()
-        sel = selector()
+        basesel = s.get_selection()
+        sel = selector()+basesel
         for irow in range( nrow ):
             sel.set_rows( irow )
@@ -1046 +1049 @@
                 #stm._arrayop( s, value[irow], mode, tsys, 'channel' )
                 stm._arrayop( s, value[irow], mode, tsys )
-            s.set_selection()
-            sel.reset()
-        del sel
-        del stm
+        s.set_selection(basesel)
     return s

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: