Changeset 152 for trunk/src/SDMath.h

Timestamp:

12/26/04 20:51:14 (19 years ago)

Author:

kil064

Message:

function 'add' and 'multiply' now take arg. doAll to
indicate whether operation to be applied to
all spectral or cursor selection only.

Combine functions 'localMultiply' and 'localAdd' into
'localOperate'

File:

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

trunk/src/SDMath.h

@@ -42 +42 @@
 
 namespace SDMath {
-  //public:
+
+// Quotient
+
   casa::CountedPtr<SDMemTable> quotient(const casa::CountedPtr<SDMemTable>& on, 
                                          const casa::CountedPtr<SDMemTable>& off);
-//
-  void multiplyInSitu(SDMemTable* in, casa::Float factor);
+
+// Multiply
+
+  void multiplyInSitu(SDMemTable* in, casa::Float factor, casa::Bool all);
   casa::CountedPtr<SDMemTable> multiply(const casa::CountedPtr<SDMemTable>& in, 
-                                        casa::Float factor);
-//
+                                        casa::Float factor, casa::Bool all);
+
+// Addition
+
+  void addInSitu (SDMemTable* in, casa::Float offset, casa::Bool all);
   casa::CountedPtr<SDMemTable> add(const casa::CountedPtr<SDMemTable>& in, 
-                             casa::Float offset);
-  
+                                   casa::Float offset, casa::Bool all);
+
+//  Hanning
+
   casa::CountedPtr<SDMemTable> hanning(const casa::CountedPtr<SDMemTable>& in);
+
+// Bin up
+
+  casa::CountedPtr<SDMemTable> bin(const casa::CountedPtr<SDMemTable>& in, 
+                             casa::Int width);
+
+// Average in time
 
   casa::CountedPtr<SDMemTable>
@@ -60 +76 @@
            bool scanAverage, const std::string& weightStr);
 
+// Average polarizations
+
   casa::CountedPtr<SDMemTable> 
   averagePol(const casa::CountedPtr<SDMemTable>& in, const casa::Vector<casa::Bool>& mask);
 
+// Statistics
+
   std::vector<float> statistic(const casa::CountedPtr<SDMemTable>& in, 
                                 const std::vector<bool>& mask, const std::string& which);
-  
-  casa::CountedPtr<SDMemTable> bin(const casa::CountedPtr<SDMemTable>& in, 
-                             casa::Int width);
 
 // private (not actually...)
 
+// Weighting type for time averaging
+
   enum weightType {NONE,VAR,TSYS};
+
+// Function to use accumulate data during time averaging
 
   void accumulate (casa::Double& timeSum, casa::Double& intSum, casa::Int& nAccum,
@@ -82 +103 @@
                    casa::Bool useMask, weightType wtType);
 
+// Function to fill Scan Container when averaging in time
+
   void fillSDC (SDContainer& sc, const casa::Array<casa::Bool>& mask,
                 const casa::Array<casa::Float>& data,
@@ -89 +112 @@
                 const casa::Vector<casa::uInt>& freqID);
 
-  SDMemTable* localMultiply (const SDMemTable& in, casa::Float factor);
+// Function to normalize data when averaging in time
 
   void normalize (casa::MaskedArray<casa::Float>& data,
@@ -95 +118 @@
                   const casa::Array<casa::Float>& nPts,
                   weightType wtType, casa::Int axis, casa::Int nAxes);
+
+// Functions for simple mathematical operations.  what=0 (mul) or 1 (add)
+
+  SDMemTable* localOperate (const SDMemTable& in, casa::Float offset, 
+                            casa::Bool doAll, casa::uInt what);
+
+// Function to get the current cursor location
+   void getCursorLocation (casa::IPosition& start, casa::IPosition& end,
+                           const SDMemTable& in);
 };