Changeset 518 for trunk/src/SDMath.h

Timestamp:

02/28/05 21:48:50 (19 years ago)

Author:

kil064

Message:

add Tsys and Tint weightring

File:

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

trunk/src/SDMath.h

@@ -136 +136 @@
 // Weighting type for time averaging
 
-  enum WeightType {NONE,VAR,TSYS};
+  enum WeightType {NONE,VAR,TSYS,TINT};
 
 // Function to use accumulate data during time averaging
@@ -143 +143 @@
                    casa::MaskedArray<casa::Float>& sum, casa::Array<casa::Float>& sumSq,
                    casa::Array<casa::Float>& nPts, casa::Array<casa::Float>& tSysSum,
+                   casa::Array<casa::Float>& tSysSqSum,
                    const casa::Array<casa::Float>& tSys,  const casa::Array<casa::Float>& nInc,
                    const casa::Vector<casa::Bool>& mask, casa::Double time, casa::Double interval,
@@ -155 +156 @@
 // Convert weight string to enum value
 
-   void convertWeightString (WeightType& wt, const casa::String& weightStr) const;
+   void convertWeightString (WeightType& wt, const casa::String& weightStr,
+                             casa::Bool listType) const;
 
 // Convert interpolation type string
@@ -233 +235 @@
   void normalize (casa::MaskedArray<casa::Float>& data,
                   const casa::Array<casa::Float>& sumSq,
+                  const casa::Array<casa::Float>& tSysSumSq,
                   const casa::Array<casa::Float>& nPts,
+                  casa::Double intSum,
                   WeightType wtType, casa::Int axis, casa::Int nAxes) const;