Changeset 3032 for trunk

Timestamp:

03/26/15 14:38:12 (10 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: No

Module(s): asap

Description: in do[CubicSpline]LeastSquareFitting(), modified the unit value for clipping threshold from rms (though 'stdDev' was used as variable name) to real standard deviation.

File:

• trunk/src/Scantable.cpp (modified) (4 diffs)

trunk/src/Scantable.cpp

@@ -3870 +3870 @@
     }
 
-    double stdDev = 0.0;
+    double mean  = 0.0;
+    double mean2 = 0.0;
     for (int i = 0; i < nChan; ++i) {
       if (maskArray[i] == 0) continue;
-      stdDev += residual[i]*residual[i];
-    }
-    stdDev = sqrt(stdDev/(double)nData);
-    rms = (float)stdDev;
+      mean  += residual[i];
+      mean2 += residual[i]*residual[i];
+    }
+    mean  /= (double)nData;
+    mean2 /= (double)nData;
+    double rmsd = sqrt(mean2 - mean*mean);
+    rms = (float)rmsd;
 
     if ((nClip == nIterClip) || (thresClip <= 0.0)) {
@@ -3882 +3886 @@
     } else {
 
-      double thres = stdDev * thresClip;
+      double thres = rmsd * thresClip;
       int newNData = 0;
       for (int i = 0; i < nChan; ++i) {
@@ -4444 +4448 @@
     }
 
-    double stdDev = 0.0;
+    double mean  = 0.0;
+    double mean2 = 0.0;
     for (int i = 0; i < nChan; ++i) {
       if (maskArray[i] == 0) continue;
-      stdDev += residual[i]*residual[i];
-    }
-    stdDev = sqrt(stdDev/(double)nData);
-    rms = (float)stdDev;
+      mean  += residual[i];
+      mean2 += residual[i]*residual[i];
+    }
+    mean  /= (double)nData;
+    mean2 /= (double)nData;
+    double rmsd = sqrt(mean2 - mean*mean);
+    rms = (float)rmsd;
 
     if ((nClip == nIterClip) || (thresClip <= 0.0)) {
@@ -4456 +4464 @@
     } else {
       
-      double thres = stdDev * thresClip;
+      double thres = rmsd * thresClip;
       int newNData = 0;
       for (int i = 0; i < nChan; ++i) {