Changeset 2142

Timestamp:

04/15/11 21:17:28 (14 years ago)

Author:

WataruKawasaki

Message:

merged from bugfixes in trunk (r2141)

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/flagtoolbar.py (modified) (1 prop)
• src (modified) (1 prop)
• src/RowAccumulator.cpp (modified) (5 diffs)
• src/RowAccumulator.h (modified) (1 diff)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/src/RowAccumulator.cpp

@@ -90 +90 @@
                                    const Double interval,
                                    const Double time,
-                                   const Bool ignoreMask)
+                                   const Bool inverseMask)
 {
   Vector<Float> vUse = v.copy();
   Vector<Bool> mUse = m.copy();
-  if (ignoreMask) mUse = !mUse;
-
+  if (inverseMask) mUse = !mUse;
   MaskedArray<Float> vadd(vUse, mUse);
-  Float totalWeight = getTotalWeight(vadd, tsys, interval, time, ignoreMask);
+  Float totalWeight = getTotalWeight(vadd, tsys, interval, time, inverseMask);
   vadd *= totalWeight;
   MaskedArray<Float> wadd(Vector<Float>(mUse.nelements(), totalWeight), mUse);
   MaskedArray<uInt> inc(Vector<uInt>(mUse.nelements(), 1), mUse);
 
-  if (ignoreMask) {
+  if (inverseMask) {
     spectrumNoMask_ += vadd;
     weightSumNoMask_ += wadd;
@@ -117 +116 @@
                                      const Double interval,
                                      const Double time,
-                                     const Bool ignoreMask)
+                                     const Bool inverseMask)
 {
   Float totalWeight = 1.0;
-
   Vector<Bool> m = data.getMask();
   if (!allEQ(m, False)) {  // only add these if not everything masked
-    totalWeight *= addTsys(tsys, ignoreMask);
-    totalWeight *= addInterval(interval, ignoreMask);
-    addTime(time, ignoreMask);
-  }
-
-  if (weightType_ == W_VAR) {
-    Float fac = 1.0/variance(data);
-    if (!ignoreMask && (m.nelements() == userMask_.nelements()))
-      fac = 1.0/variance(data(userMask_));
-
-    totalWeight *= fac;
+    totalWeight *= addTsys(tsys, inverseMask);
+    totalWeight *= addInterval(interval, inverseMask);
+    addTime(time, inverseMask);
+
+    if (weightType_ == W_VAR) {
+      Float fac = 1.0/variance(data);
+      if (!inverseMask && (m.nelements() == userMask_.nelements()))
+        fac = 1.0/variance(data(userMask_));
+
+      totalWeight *= fac;
+    }
   }
 
@@ -139 +137 @@
 }
 
-Float RowAccumulator::addTsys(const Vector<Float>& v, Bool ignoreMask)
+Float RowAccumulator::addTsys(const Vector<Float>& v, Bool inverseMask)
 {
   // @fixme this assume tsys is the same for all channels
 
   Float w = 1.0;
-  if (ignoreMask) {
+  if (inverseMask) {
     tsysSumNoMask_ += v[0];
   } else {
@@ -155 +153 @@
 }
 
-void RowAccumulator::addTime(Double t, Bool ignoreMask)
-{
-  if (ignoreMask) {
+void RowAccumulator::addTime(Double t, Bool inverseMask)
+{
+  if (inverseMask) {
     timeSumNoMask_ += t;
   } else {
@@ -164 +162 @@
 }
 
-Float RowAccumulator::addInterval(Double inter, Bool ignoreMask)
+Float RowAccumulator::addInterval(Double inter, Bool inverseMask)
 {
   Float w = 1.0;
-  if (ignoreMask) {
+  if (inverseMask) {
     intervalSumNoMask_ += inter;
   } else {

branches/casa-prerelease/pre-asap/src/RowAccumulator.h

@@ -108 +108 @@
                      const casa::Double interval,
                      const casa::Double time,
-                     const casa::Bool ignoreMask);
+                     const casa::Bool inverseMask);
   casa::Float getTotalWeight(const casa::MaskedArray<casa::Float>& data,
                              const casa::Vector<casa::Float>& tsys,
                              const casa::Double interval,
                              const casa::Double time,
-                             const casa::Bool ignoreMask);
-  casa::Float addTsys(const casa::Vector<casa::Float>& v, casa::Bool ignoreMask);
-  casa::Float addInterval(casa::Double inter, casa::Bool ignoreMask);
-  void addTime(casa::Double t, casa::Bool ignoreMask);
+                             const casa::Bool inverseMask);
+  casa::Float addTsys(const casa::Vector<casa::Float>& v, casa::Bool inverseMask);
+  casa::Float addInterval(casa::Double inter, casa::Bool inverseMask);
+  void addTime(casa::Double t, casa::Bool inverseMask);
 
   WeightType weightType_;