Changeset 162

Timestamp:

12/27/04 16:22:34 (19 years ago)

Author:

kil064

Message:

add more 'private' functions

File:

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

trunk/src/SDMath.h

@@ -90 +90 @@
 // Weighting type for time averaging
 
-  enum weightType {NONE,VAR,TSYS};
+  enum WeightType {NONE,VAR,TSYS};
 
 // Function to use accumulate data during time averaging
@@ -101 +101 @@
                    const casa::Block<casa::CountedPtr<SDMemTable> >& in,
                    casa::uInt iTab, casa::uInt iRow, casa::uInt axis, casa::uInt nAxesSub,
-                   casa::Bool useMask, weightType wtType);
+                   casa::Bool useMask, WeightType wtType);
 
 // Function to fill Scan Container when averaging in time
@@ -112 +112 @@
                 const casa::Vector<casa::uInt>& freqID);
 
+// Put the data and mask into the SDContainer
+   void putDataInSDC (SDContainer& sc, const casa::Array<casa::Float>& data,
+                      const casa::Array<casa::Bool>& mask);
+
 // Function to normalize data when averaging in time
 
@@ -117 +121 @@
                   const casa::Array<casa::Float>& sumSq,
                   const casa::Array<casa::Float>& nPts,
-                  weightType wtType, casa::Int axis, casa::Int nAxes);
+                  WeightType wtType, casa::Int axis, casa::Int nAxes);
 
 // Functions for simple mathematical operations.  what=0 (mul) or 1 (add)
@@ -127 +131 @@
    void getCursorLocation (casa::IPosition& start, casa::IPosition& end,
                            const SDMemTable& in);
+
+// Convert weight string to enum value
+
+   void convertWeightString (WeightType& wt, const std::string& weightStr);
 };