Changeset 1682 for branches/alma

Timestamp:

02/02/10 18:47:39 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1823

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix.
Supported operation with 1D list with length of 1, and with 2D list with
shape of (1,1) or (1,nchan).

Location:

branches/alma

Files:

• python/asapmath.py (modified) (1 diff)
• src/STMath.cpp (modified) (4 diffs)

branches/alma/python/asapmath.py

@@ -1060 +1060 @@
     nrow = scan.nrow()
     s = None
-    if len( value ) != nrow:
-        asaplog.push( 'len(value) must conform to scan.nrow()' )
+    if len( value ) == 1:
+        from asap._asap import stmath
+        stm = stmath()
+        s = scantable( stm._arrayop( scan.copy(), value[0], mode, tsys ) )
+        del stm
+    elif len( value ) != nrow:
+        asaplog.push( 'len(value) must be 1 or conform to scan.nrow()' )
         print_log( 'ERROR' )
     else:

branches/alma/src/STMath.cpp

@@ -528 +528 @@
                                                      bool tsys )
 {
+  if ( val.size() == 1 ){
+    return unaryOperate( in, val[0], mode, tsys ) ;
+  }
+
   // conformity of SPECTRA and TSYS
   if ( tsys ) {
@@ -557 +561 @@
   Vector<Float> fact( val ) ;
   if ( fact.nelements() != mchans[0] ) {
-    throw( AipsError("Vector size must be same as number of channel.") ) ;
+    throw( AipsError("Vector size must be 1 or be same as number of channel.") ) ;
   }
 
@@ -600 +604 @@
                                                  bool tsys )
 {
+  if ( val.size() == 1 ) {
+    return unaryOperate( in, val[0], mode, tsys ) ;
+  }
+
   // conformity of SPECTRA and TSYS
   if ( tsys ) {
@@ -618 +626 @@
   Vector<Float> fact( val ) ;
   if ( fact.nelements() != in->nrow() ) {
-    throw( AipsError("Vector size must be same as number of row.") ) ;
+    throw( AipsError("Vector size must be 1 or be same as number of row.") ) ;
   }