Changeset 17312

Timestamp:

Apr 2, 2008, 8:03:08 PM (18 years ago)

Author:

eugene

Message:

update changes from head

File:

• branches/eam_branch_20080324/psphot/src/psphotApResid.c (modified) (2 diffs)

branches/eam_branch_20080324/psphot/src/psphotApResid.c

@@ -267 +267 @@
         psStatsInit (statsM);
 
-        psVectorStats (statsS, dASubset, NULL, mkSubset, 0xff);
-        psVectorStats (statsM, dMSubset, NULL, mkSubset, 0xff);
-
-        dSo->data.F32[i] = statsS->robustStdev;
-        dMo->data.F32[i] = statsM->sampleMean;
-
-        dRo->data.F32[i] = statsS->robustStdev / statsM->sampleMean;
+        if (j > 2) {
+            bool status = true;
+            status &= psVectorStats (statsS, dASubset, NULL, mkSubset, 0xff);
+            status &= psVectorStats (statsM, dMSubset, NULL, mkSubset, 0xff);
+            if (!status) { psErrorClear (); }
+            dSo->data.F32[i] = statsS->robustStdev;
+            dMo->data.F32[i] = statsM->sampleMean;
+            dRo->data.F32[i] = statsS->robustStdev / statsM->sampleMean;
+        } else {
+            dSo->data.F32[i] = NAN;
+            dMo->data.F32[i] = NAN;
+            dRo->data.F32[i] = NAN;
+        }
     }
     psFree (dMSubset);
@@ -280 +286 @@
     
     psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN);
-    psVectorStats (stats, dRo, NULL, NULL, 0);
+    if (!psVectorStats (stats, dRo, NULL, NULL, 0)) {
+        // XXX better testing of raised error
+        psErrorClear();
+    }
 
     *errorScale = stats->sampleMedian;