Changeset 234 for trunk/src/SDMath.h

Timestamp:

01/21/05 12:18:58 (19 years ago)

Author:

kil064

Message:

add binary table operation
add opacity
rework gain-elevation to handle polynomials

File:

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

trunk/src/SDMath.h

@@ -36 +36 @@
 #include <casa/aips.h>
 #include <casa/Utilities/CountedPtr.h>
+#include "SDDefs.h"
 
 class casa::Table;
@@ -61 +62 @@
 // Quotient
    casa::CountedPtr<SDMemTable> quotient(const casa::CountedPtr<SDMemTable>& on, 
-                                         const casa::CountedPtr<SDMemTable>& off);
+                                         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;
 
 // Average in time
    casa::CountedPtr<SDMemTable>  average(const casa::Block<casa::CountedPtr<SDMemTable> >& in,
                                          const casa::Vector<casa::Bool>& mask,
-                                         casa::Bool scanAverage, const casa::String& weightStr);
-//                                         casa::Bool alignVelocity);
+                                         casa::Bool scanAverage, 
+                                         const casa::String& weightStr) const;
+//                                         casa::Bool alignVelocity) const;
 
-// Statistics
+// Statistics. If row<0, all rows are done otherwise, just the 
+// specified row.
    std::vector<float> statistic(const casa::CountedPtr<SDMemTable>& in, 
-                                const std::vector<bool>& mask, const casa::String& which);
+                                const casa::Vector<casa::Bool>& mask, 
+                                const casa::String& which, casa::Int row) const;
 
 // Bin up spectra
-   SDMemTable* bin(const SDMemTable& in, casa::Int width);
+   SDMemTable* bin(const SDMemTable& in, casa::Int width) const;
 
 // Smooth
    SDMemTable* smooth (const SDMemTable& in, const casa::String& kernel,
-                       casa::Float width, casa::Bool doAll);
+                       casa::Float width, casa::Bool doAll) const;
 
 // Flux conversion between Jansky and Kelvin
    SDMemTable* convertFlux (const SDMemTable& in, casa::Float area, 
-                            casa::Float eta, casa::Bool doAll);
+                            casa::Float eta, casa::Bool doAll) const;
 
 // Gain-elevation correction
-   SDMemTable* gainElevation (const SDMemTable& in, const casa::String& fileName,
-                              const casa::String& method, casa::Bool doAll);
+   SDMemTable* gainElevation (const SDMemTable& in, const casa::Vector<casa::Float>& coeffs,
+                              const casa::String& fileName,
+                              const casa::String& method, casa::Bool doAll) const;
+
+// Opacity correction
+   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);
+                             casa::Bool doAll, casa::uInt what) const;
 
 // Average polarizations
-   SDMemTable* averagePol(const SDMemTable& in, const casa::Vector<casa::Bool>& mask);
+   SDMemTable* averagePol(const SDMemTable& in, const casa::Vector<casa::Bool>& mask) const;
 
  private:
@@ -143 +157 @@
    void convertInterpString(casa::Int& type, const casa::String& interp) const;
 
-
 // Correct data from an ascii Table
-   SDMemTable* correctFromAsciiTable(SDMemTable* pTabOut, const SDMemTable& in, 
-                                     const casa::String& fileName,
-                                     const casa::String& col0, const casa::String& col1,
-                                     const casa::String& methodStr, casa::Bool doAll,
-                                     const casa::Vector<casa::Float>& xOut);
+   void correctFromAsciiTable(SDMemTable* pTabOut, const SDMemTable& in, 
+                              const casa::String& fileName,
+                              const casa::String& col0, const casa::String& col1,
+                              const casa::String& methodStr, casa::Bool doAll,
+                              const casa::Vector<casa::Float>& xOut) const;
 
 // Correct data from a Table
-   SDMemTable* correctFromTable(SDMemTable* pTabOut, const SDMemTable& in, const casa::Table& tTable,
-                                const casa::String& col0, const casa::String& col1,
-                                const casa::String& methodStr, casa::Bool doAll,
-                                const casa::Vector<casa::Float>& xOut);
+   void correctFromTable(SDMemTable* pTabOut, const SDMemTable& in, const casa::Table& tTable,
+                         const casa::String& col0, const casa::String& col1,
+                         const casa::String& methodStr, casa::Bool doAll,
+                         const casa::Vector<casa::Float>& xOut) const;
+
+// Correct data from a Vector
+   void correctFromVector (SDMemTable* pTabOut, const SDMemTable& in,
+                           casa::Bool doAll, const casa::Vector<casa::Float>& factor) const;
+
+
 
 // Read ascii file into a Table
 
    casa::Table readAsciiFile (const casa::String& fileName) const;
-                   
 };