Changeset 315

Timestamp:

01/28/05 02:09:17 (19 years ago)

Author:

kil064

Message:

add arg 'weightStr' to function SDMath::averagePol

Location:

trunk/src

Files:

• SDMath.cc (modified) (6 diffs)
• SDMath.h (modified) (1 diff)
• SDMathWrapper.cc (modified) (2 diffs)
• SDMathWrapper.h (modified) (1 diff)

trunk/src/SDMath.cc

@@ -809 +809 @@
 
 
-SDMemTable* SDMath::averagePol(const SDMemTable& in, const Vector<Bool>& mask) const
+SDMemTable* SDMath::averagePol(const SDMemTable& in, const Vector<Bool>& mask,
+                               const String& weightStr) const
 //
 // Average all polarizations together, weighted by variance
 //
 {
-//   WeightType wtType = NONE;
-//   convertWeightString(wtType, weight);
+   WeightType wtType = NONE;
+   convertWeightString(wtType, weightStr);
 
    const uInt nRows = in.nRow();
@@ -832 +833 @@
   IPosition shapeOut(shapeIn);
   shapeOut(asap::PolAxis) = 1;                          // Average all polarizations
+  if (shapeIn(asap::PolAxis)==1) {
+     throw(AipsError("The input has only one polarisation"));
+  }
 //
   const uInt nChan = shapeIn(asap::ChanAxis);
@@ -874 +878 @@
         Vector<Bool> t2(nChan); t2 = True;
         MaskedArray<Float> vecSum(t1,t2);
-        Float varSum = 0.0;
+        Float norm = 0.0;
         {
            ReadOnlyVectorIterator<Float> itDataVec(itDataPlane.array(), 1);
@@ -880 +884 @@
            while (!itDataVec.pastEnd()) {     
 
-// Create MA of data & mask (optionally including OTF mask) and  get variance 
+// Create MA of data & mask (optionally including OTF mask) and  get variance for this spectrum
 
               if (useMask) {
                  const MaskedArray<Float> spec(itDataVec.vector(),mask&&itMaskVec.vector());
-                 fac = 1.0 / variance(spec);
+                 if (wtType==VAR) fac = 1.0 / variance(spec);
               } else {
                  const MaskedArray<Float> spec(itDataVec.vector(),itMaskVec.vector());
-                 fac = 1.0 / variance(spec);
+                 if (wtType==VAR) fac = 1.0 / variance(spec);
               }
 
@@ -894 +898 @@
               const MaskedArray<Float> spec(fac*itDataVec.vector(), itMaskVec.vector());
               vecSum += spec;
-              varSum += fac;
+              norm += fac;
 
 // Next
@@ -905 +909 @@
 // Normalize summed spectrum
 
-        vecSum /= varSum;
+        vecSum /= norm;
 
 // FInd position in input data array.  We are iterating by pol-channel

trunk/src/SDMath.h

@@ -116 +116 @@
 
 // Average polarizations
-   SDMemTable* averagePol(const SDMemTable& in, const casa::Vector<casa::Bool>& mask) const;
+   SDMemTable* averagePol(const SDMemTable& in, const casa::Vector<casa::Bool>& mask,
+                          const casa::String& wtStr) const;
 
  private:

trunk/src/SDMathWrapper.cc

@@ -170 +170 @@
 
 void SDMathWrapper::averagePolInSitu(SDMemTableWrapper& in, 
-                                     const std::vector<bool>& mask)
+                                     const std::vector<bool>& mask,
+                                     const std::string& weightStr)
 {
   SDMemTable* pIn = in.getPtr();
   SDMath sdm;
   Vector<Bool> tMask(mask);
-  SDMemTable* pOut = sdm.averagePol (*pIn, tMask);
+  SDMemTable* pOut = sdm.averagePol (*pIn, tMask, String(weightStr));
   *pIn = *pOut;
    delete pOut;
@@ -181 +182 @@
 
 SDMemTableWrapper SDMathWrapper::averagePol (const SDMemTableWrapper& in,
-                                             const std::vector<bool>& mask)
-
+                                             const std::vector<bool>& mask,
+                                             const std::string& weightStr)
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   SDMath sdm;
   Vector<Bool> tMask(mask);
-  return CountedPtr<SDMemTable>(sdm.averagePol(*pIn, tMask));
+  return CountedPtr<SDMemTable>(sdm.averagePol(*pIn, tMask, String(weightStr)));
 }
 

trunk/src/SDMathWrapper.h

@@ -102 +102 @@
 
 // Average polarizations
-  void averagePolInSitu(SDMemTableWrapper& in,  const std::vector<bool>& mask);
+  void averagePolInSitu(SDMemTableWrapper& in,  const std::vector<bool>& mask,
+                        const std::string& weightStr);
   SDMemTableWrapper averagePol(const SDMemTableWrapper& in,
-                               const std::vector<bool>& mask);
+                               const std::vector<bool>& mask,
+                               const std::string& weightStr);
 
 // Statistics