Changeset 31069

Timestamp:

Mar 28, 2011, 12:56:50 PM (15 years ago)

Author:

watersc1

Message:

Use more robust bin rejection code. Now, each bin must have at least 10 samples, and no more than 50% of the samples can be rejected by the outlier clipping phase. Tested on two chips, decreasing the fringe_0 value from 95 and 60 to 6 and 5.

File:

• trunk/psModules/src/detrend/pmFringeStats.c (modified) (3 diffs)

trunk/psModules/src/detrend/pmFringeStats.c

@@ -1029 +1029 @@
     psVector *science_values   = psVectorAllocEmpty(4000,PS_TYPE_F32);
     psVector *science_errors   = psVectorAllocEmpty(4000,PS_TYPE_F32);
-
-    psStats *binStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
+    psVector *science_counts   = psVectorAllocEmpty(4000,PS_TYPE_S32);
+
+    psStats *binStats = psStatsAlloc(PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
     for (int i = 0; i < 4000; i++) {
       psVector *bin = bins->data[i];
-      if (bin->n > 2) {
+      if (bin->n > 10) {
         psStatsInit(binStats);
 
         psVectorStats(binStats,bin,NULL,NULL,1);
         
-        if (isfinite(binStats->robustStdev) &&
-            isfinite(binStats->robustMedian) &&
-            binStats->robustStdev > 0) {
+        if (isfinite(binStats->clippedStdev) &&
+            isfinite(binStats->clippedMean) &&
+            (binStats->clippedStdev > 0) &&
+            (binStats->clippedNvalues > 10) &&
+            (binStats->clippedNvalues > 0.5 * bin->n)
+            ) {
           psVectorAppend(fringe_positions,-0.1 + i * 5e-5);
-          psVectorAppend(science_values, binStats->robustMedian);
-          psVectorAppend(science_errors, binStats->robustStdev);
+          psVectorAppend(science_values, binStats->clippedMean);
+          psVectorAppend(science_errors, binStats->clippedStdev);
+          psVectorAppend(science_counts, bin->n);
         }
       }
@@ -1052 +1057 @@
 
     for (int i = 0; i < fringe_positions->n; i++) {
-      psTrace("psModules.detrend",7,"FITDATA: %f %f %f\n",
+      psTrace("psModules.detrend",7,"FITDATA: %f %f %f %d\n",
               fringe_positions->data.F32[i],
               science_values->data.F32[i],
-              science_errors->data.F32[i]);
+              science_errors->data.F32[i],
+              science_counts->data.S32[i]);
     }
 /*     // Begin switch from old outlier removal and fitting code. */
@@ -1071 +1077 @@
     psFree(science_values);
     psFree(science_errors);
+    psFree(science_counts);
     
     for (int i = 0; i <= poly->nX; i++) {