Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotApResid.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotApResid.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/psphot/src

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotApResid.c

@@ -355 +355 @@
 
         if (j > 2) {
-            bool status = true;
-            status &= psVectorStats (statsS, dASubset, NULL, mkSubset, 0xff);
-            status &= psVectorStats (statsM, dMSubset, NULL, mkSubset, 0xff);
-            if (!status) { psErrorClear (); }
+            if (!psVectorStats (statsS, dASubset, NULL, mkSubset, 0xff)) {
+                psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+                return false;
+            }
+            if (!psVectorStats (statsM, dMSubset, NULL, mkSubset, 0xff)) {
+                psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+                return false;
+            }
             dSo->data.F32[i] = statsS->robustStdev;
             dMo->data.F32[i] = statsM->sampleMean;
             dRo->data.F32[i] = statsS->robustStdev / statsM->sampleMean;
-            //      fprintf (stderr, "%d (%d) : sys: %f, phot: %f, rat: %f\n", i, j, dSo->data.F32[i], dMo->data.F32[i], dRo->data.F32[i]);
         } else {
             dSo->data.F32[i] = NAN;
@@ -375 +378 @@
     psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN);
     if (!psVectorStats (stats, dRo, NULL, NULL, 0)) {
-        // XXX better testing of raised error
-        psErrorClear();
+        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+        return false;
     }
 

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h