Changeset 1678 for branches/alma

Timestamp:

01/28/10 17:48:32 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1823

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix.

• self.nchan(0) is replaced with self.nchan(self.getifnos()[0])
• casalog.post() should not use. Use asaplog.push() and print_log() instead.

File:

• branches/alma/python/scantable.py (modified) (4 diffs)

branches/alma/python/scantable.py

@@ -2047 +2047 @@
             if len(other) == self.nrow(): 
                 s = scantable(self._math._arrayop(self.copy(), other, "ADD", False, 'row'))
-            elif len(other) == self.nchan(0):
+            elif len(other) == self.nchan(self.getifnos()[0]):
                 s = scantable(self._math._arrayop(self.copy(), other, "ADD", False, 'channel'))
             else:
-                casalog.post( 'Length of list operand should equal to either scantable.nchan() or scantable.nrow().', 'ERROR' )
+                asaplog.push( 'Length of list operand should equal to either scantable.nchan() or scantable.nrow().' )
+                print_log( 'ERROR' )
         else:
             raise TypeError("Other input is not a scantable or float value or float list")
@@ -2070 +2071 @@
             if len(other) == self.nrow(): 
                 s = scantable(self._math._arrayop(self.copy(), other, "SUB", False, 'row'))
-            elif len(other) == self.nchan(0):
+            elif len(other) == self.nchan(self.getifnos()[0]):
                 s = scantable(self._math._arrayop(self.copy(), other, "SUB", False, 'channel'))
             else:
-                casalog.post( 'Length of list operand should equal to either scantable.nchan() or scantable.nrow().', 'ERROR' )
+                asaplog.push( 'Length of list operand should equal to either scantable.nchan() or scantable.nrow().' )
+                print_log( 'ERROR' )
         else:
             raise TypeError("Other input is not a scantable or float value or float list")
@@ -2093 +2095 @@
             if len(other) == self.nrow(): 
                 s = scantable(self._math._arrayop(self.copy(), other, "MUL", False, 'row'))
-            elif len(other) == self.nchan(0):
+            elif len(other) == self.nchan(self.getifnos()[0]):
                 s = scantable(self._math._arrayop(self.copy(), other, "MUL", False, 'channel'))
             else:
-                casalog.post( 'Length of list operand should equal to either scantable.nchan() or scantable.nrow().', 'ERROR' )
+                asaplog.push( 'Length of list operand should equal to either scantable.nchan() or scantable.nrow().' )
+                print_log( 'ERROR' )
         else:
             raise TypeError("Other input is not a scantable or float value or float list")
@@ -2118 +2121 @@
             if len(other) == self.nrow(): 
                 s = scantable(self._math._array2dop(self.copy(), other, "DIV", False, 'row'))
-            elif len(other) == self.nchan(0):
+            elif len(other) == self.nchan(self.getifnos()[0]):
                 s = scantable(self._math._arrayop(self.copy(), other, "DIV", False, 'channel'))
             else:
-                casalog.post( 'Length of list operand should equal to either scantable.nchan() or scantable.nrow().', 'ERROR' )
+                asaplog.push( 'Length of list operand should equal to either scantable.nchan() or scantable.nrow().' )
+                print_log( 'ERROR' )
         else:
             raise TypeError("Other input is not a scantable or float value or float list")