Changeset 23989 for trunk/psModules/src/detrend

Timestamp:

Apr 28, 2009, 11:21:56 AM (17 years ago)

Author:

eugene

Message:

always handle psVectorStats false return status (is an error); check for NAN results and handle as possible

Location:

trunk/psModules/src/detrend

Files:

• pmFringeStats.c (modified) (2 diffs)
• pmOverscan.c (modified) (4 diffs)
• pmRemnance.c (modified) (1 diff)
• pmShutterCorrection.c (modified) (1 diff)

trunk/psModules/src/detrend/pmFringeStats.c

@@ -882 +882 @@
 
     psStats *stats = psStatsAlloc(PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_QUARTILE); // Statistics
-    psVectorStats(stats, diffs, NULL, mask, 1);
+    if (!psVectorStats(stats, diffs, NULL, mask, 1)) {
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+        return 0;
+    }
     float middle = stats->sampleMedian; // The middle of the distribution
     float thresh = rej * 0.74 * (stats->sampleUQ - stats->sampleLQ); // The rejection threshold
@@ -969 +972 @@
 
     // Get rid of the extreme outliers by assuming most of the points are somewhat clustered
-    psVectorStats(median, science->f, NULL, NULL, 0);
+    if (!psVectorStats(median, science->f, NULL, NULL, 0)) {
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+        return NULL;
+    }
     scale->coeff->data.F32[0] = median->sampleMedian;
     for (int i = 0; i < fringes->n; i++) {
         pmFringeStats *fringe = fringes->data[i]; // The fringe of interest
-        psVectorStats(median, fringe->f, NULL, NULL, 0);
+        if (!psVectorStats(median, fringe->f, NULL, NULL, 0)) {
+            psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+            return NULL;
+        }
         scale->coeff->data.F32[0] -= median->sampleMedian;
         scale->coeff->data.F32[i] = 0.0;

trunk/psModules/src/detrend/pmOverscan.c

@@ -74 +74 @@
             mask->data.PS_TYPE_VECTOR_MASK_DATA[i] = 0;
             ordinate->data.F32[i] = 2.0*(float)i/(float)pixels->n - 1.0; // Scale to [-1,1]
-            psVectorStats(myStats, values, NULL, NULL, 0);
+            if (!psVectorStats(myStats, values, NULL, NULL, 0)) {
+                psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+                return false;
+            }
             reduced->data.F32[i] = psStatsGetValue(myStats, statistic);
         } else if (overscanOpts->fitType == PM_FIT_NONE) {
@@ -275 +278 @@
         psFree(iter);
 
-        (void)psVectorStats(stats, pixels, NULL, NULL, 0);
+        if (!psVectorStats(stats, pixels, NULL, NULL, 0)) {
+            psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+            return false;
+        }
         psFree(pixels);
         double reduced = psStatsGetValue(stats, statistic); // Result of statistics
@@ -349 +355 @@
           psString comment = NULL;    // Comment to add
           psStats *vectorStats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
-          psVectorStats (vectorStats, reduced, NULL, NULL, 0);
+          if (!psVectorStats (vectorStats, reduced, NULL, NULL, 0)) {
+              psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+              return false;
+          }
           psStringAppend(&comment, "Mean Overscan value: %f", vectorStats->sampleMean);
           psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, comment, "");
@@ -412 +421 @@
           psString comment = NULL;    // Comment to add
           psStats *vectorStats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
-          psVectorStats (vectorStats, reduced, NULL, NULL, 0);
+          if (!psVectorStats (vectorStats, reduced, NULL, NULL, 0)) {
+              psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+              return false;
+          }
           psStringAppend(&comment, "Mean Overscan value: %f", vectorStats->sampleMean);
           psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, comment, "");

trunk/psModules/src/detrend/pmRemnance.c

@@ -66 +66 @@
             values->n = numValues;
             if (!psVectorStats(stats, values, NULL, NULL, 0)) {
-                // Can't do anything about it
-                psErrorClear();
+                psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+                return false;
+            }
+            if (isnan(stats->sampleMedian)) {
                 maxMask = max;
                 continue;

trunk/psModules/src/detrend/pmShutterCorrection.c

@@ -350 +350 @@
     psStats *rawStats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
     psStats *resStats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
-    psVectorStats (rawStats, counts, NULL, NULL, 0);
-    psVectorStats (resStats, resid, NULL, NULL, 0);
+    if (!psVectorStats (rawStats, counts, NULL, NULL, 0)) {
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+        return NULL;
+    }
+    if (!psVectorStats (resStats, resid, NULL, NULL, 0)) {
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+        return NULL;
+    }
 
     // XXX temporary hard-wired minimum stdev improvement factor
     psTrace("psModules.detrend", 3, "raw scatter %f vs res scatter %f\n", rawStats->sampleStdev, resStats->sampleStdev);
     if (rawStats->sampleStdev / resStats->sampleStdev < 1.5) corr->valid = false;
+    if (isnan(rawStats->sampleStdev) || isnan(resStats->sampleStdev)) corr->valid = false;
 
     psFree (rawStats);