Changeset 2890 for trunk

Timestamp:

01/10/14 20:26:37 (11 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes:

Module(s): sd

Description: (1) fixed Scantable::do{CubicSpline}LeastSquareFitting() to correctly avoid using NaN/Inf data (in calculating sigma of residual spectrum). (2) clean-up parse_spw_selection() code in scantable.py.

Location:

trunk

Files:

• python/scantable.py (modified) (2 diffs)
• src/Scantable.cpp (modified) (8 diffs)

trunk/python/scantable.py

@@ -2048 +2048 @@
         
         return res
-    #found
-
+    
     @asaplog_post_dec
     def get_first_rowno_by_if(self, ifno):
@@ -2074 +2073 @@
 
         return res
-    # doppler
-##################################
     
     @asaplog_post_dec

trunk/src/Scantable.cpp

@@ -3556 +3556 @@
   for (int i = 0; i < nChan; ++i) {
     maskArray[i] = mask[i] ? 1 : 0;
+    if (isnan(data[i])) maskArray[i] = 0;
+    if (isinf(data[i])) maskArray[i] = 0;
+
+    finalMask[i] = (maskArray[i] == 1);
+    if (finalMask[i]) {
+      j++;
+    }
+
+    /*
+    maskArray[i] = mask[i] ? 1 : 0;
     if (mask[i]) {
       j++;
     }
     finalMask[i] = mask[i];
+    */
   }
 
@@ -3611 +3622 @@
     }
 
+    //compute inverse matrix of the left half of xMatrix
     std::vector<double> invDiag(nDOF);
     for (int i = 0; i < nDOF; ++i) {
@@ -3669 +3681 @@
     double stdDev = 0.0;
     for (int i = 0; i < nChan; ++i) {
-      stdDev += residual[i]*residual[i]*(double)maskArray[i];
+      if (maskArray[i] == 0) continue;
+      stdDev += residual[i]*residual[i];
     }
     stdDev = sqrt(stdDev/(double)nData);
@@ -3690 +3703 @@
       }
       if (newNData == nData) {
-        break; //no more flag to add. iteration stops.
+        break; //no more flag to add. stop iteration.
       } else {
         nData = newNData;
@@ -3712 +3725 @@
 
   return result;
-}
+} //xMatrix
 
 void Scantable::cubicSplineBaseline(const std::vector<bool>& mask, int nPiece, 
@@ -3955 +3968 @@
   for (int i = 0; i < nChan; ++i) {
     maskArray[i] = mask[i] ? 1 : 0;
+    if (isnan(data[i])) maskArray[i] = 0;
+    if (isinf(data[i])) maskArray[i] = 0;
+
+    finalMask[i] = (maskArray[i] == 1);
+    if (finalMask[i]) {
+      x[j] = i;
+      j++;
+    }
+
+    /*
+    maskArray[i] = mask[i] ? 1 : 0;
     if (mask[i]) {
       x[j] = i;
@@ -3960 +3984 @@
     }
     finalMask[i] = mask[i];
+    */
   }
 
@@ -4170 +4195 @@
     double stdDev = 0.0;
     for (int i = 0; i < nChan; ++i) {
-      stdDev += residual[i]*residual[i]*(double)maskArray[i];
+      if (maskArray[i] == 0) continue;
+      stdDev += residual[i]*residual[i];
     }
     stdDev = sqrt(stdDev/(double)nData);