Changeset 248 for trunk/src/SDMath.h

Timestamp:

01/21/05 15:34:59 (20 years ago)

Author:

kil064

Message:

remove function 'quotient' and put its functionality into
function 'binaryOperate'

File:

• trunk/src/SDMath.h (modified) (3 diffs)

trunk/src/SDMath.h

@@ -60 +60 @@
    ~SDMath();
 
-// Quotient
-   casa::CountedPtr<SDMemTable> quotient(const casa::CountedPtr<SDMemTable>& on, 
-                                         const casa::CountedPtr<SDMemTable>& off,
-                                         casa::Bool preserveContinuum=casa::True) const;
-
-// Simple binary Table operators. add, subtract, multiply, divide (what=0,1,2,3)
-   casa::CountedPtr<SDMemTable> simpleBinaryOperate (const casa::CountedPtr<SDMemTable>& left,
-                                                     const casa::CountedPtr<SDMemTable>& right,
-                                                     const casa::String& op) const;
+// Binary Table operators. op=ADD, SUB, MUL, DIV, QUOTIENT
+   casa::CountedPtr<SDMemTable> binaryOperate (const casa::CountedPtr<SDMemTable>& left,
+                                               const casa::CountedPtr<SDMemTable>& right,
+                                               const casa::String& op, casa::Bool preserve) const;
 
 // Average in time
@@ -74 +69 @@
                                          const casa::Vector<casa::Bool>& mask,
                                          casa::Bool scanAverage, 
-                                         const casa::String& weightStr) const;
-//                                         casa::Bool alignVelocity) const;
+                                         const casa::String& weightStr,
+                                         casa::Bool alignVelocity=casa::False) const;
 
 // Statistics. If row<0, all rows are done otherwise, just the 
@@ -102 +97 @@
    SDMemTable* opacity (const SDMemTable& in, casa::Float tau, casa::Bool doAll) const;
 
-// Simple mathematical operations.  what=0 (mul) or 1 (add)
-   SDMemTable* simpleOperate(const SDMemTable& in, casa::Float offset, 
-                             casa::Bool doAll, casa::uInt what) const;
+// Simple unary mathematical operations.  what=0 (mul) or 1 (add)
+   SDMemTable* unaryOperate(const SDMemTable& in, casa::Float offset, 
+                            casa::Bool doAll, casa::uInt what) const;
 
 // Average polarizations