Changeset 1680 for branches/alma/src

Timestamp:

01/29/10 14:07:38 (15 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: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

1. Bug fix

In scantable.py, self._math = stmath() should be
self._math = stmath( rcParamsinsitu ).

2. Delete operation mode

I have deleted operation mode parameter which is used for a function
to do an operation of scantable with 1D list, since I have implemented
the operation of scantable with 2D list.

3. Extend operation of scantable

Now, operation of scantable with 2D list is available.

4. Accept integer input for operation

Operation of scantable with int as well as int list is working
in addition to operation with float or float list.

Location:

branches/alma/src

Files:

• STMath.cpp (modified) (1 diff)
• STMath.h (modified) (1 diff)
• STMathWrapper.h (modified) (1 diff)

branches/alma/src/STMath.cpp

@@ -507 +507 @@
                                               const std::vector<float> val,
                                               const std::string& mode,
-                                              bool tsys,
-                                              const std::string& op )
+                                              const std::string& opmode, 
+                                              bool tsys )
 {
   CountedPtr< Scantable > out ;
-  if ( op == "channel" ) {
+  if ( opmode == "channel" ) {
     out = arrayOperateChannel( in, val, mode, tsys ) ;
   }
-  else if ( op == "row" ) {
+  else if ( opmode == "row" ) {
     out = arrayOperateRow( in, val, mode, tsys ) ;
   }

branches/alma/src/STMath.h

@@ -123 +123 @@
     arrayOperate( const casa::CountedPtr<Scantable>& in,
                   const std::vector<float> val,
-                  const std::string& mode, bool tsys=false,
-                  const std::string& op="channel" );
+                  const std::string& mode,
+                  const std::string& opmode="channel",  
+                  bool tsys=false );
 
   // channel operation

branches/alma/src/STMathWrapper.h

@@ -75 +75 @@
   ScantableWrapper arrayOperate( const ScantableWrapper& in, 
                                  const std::vector<float> val,
-                                 const std::string& mode, bool tsys=false,
-                                 const std::string& op="channel" )
-  { return ScantableWrapper(STMath::arrayOperate(in.getCP(), val, mode, tsys, op)); }
+                                 const std::string& mode,
+                                 bool tsys=false )
+  { return ScantableWrapper(STMath::arrayOperateChannel(in.getCP(), val, mode, tsys)); }
 
   ScantableWrapper array2dOperate( const ScantableWrapper& in,