Changeset 19474

Timestamp:

Sep 10, 2008, 2:38:23 PM (18 years ago)

Author:

Paul Price

Message:

In one case, all of dE0subset were the same value (3.81469727e-06), so
the stdev was NAN. Trap and ignore this case.

File:

• trunk/psModules/src/objects/pmPSFtry.c (modified) (5 diffs)

trunk/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-18 00:40:47 $
+ *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-09-11 00:38:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -802 +802 @@
     int nBin = PS_MAX (mag->n / nGroup, 1);
 
-    // output vectors for ApResid trend
-    psVector *dSo = psVectorAlloc (nBin, PS_TYPE_F32);
-
     // use mag to group parameters in sequence
     psVector *index = psVectorSortIndex (NULL, mag);
@@ -815 +812 @@
 
     int n = 0;
-    for (int i = 0; i < dSo->n; i++) {
+    float min = INFINITY;               // Minimum error
+    for (int i = 0; i < nBin; i++) {
         int j;
         for (j = 0; (j < nGroup) && (n < mag->n); j++, n++) {
@@ -844 +842 @@
         dEsquare += PS_SQR(psStatsGetValue(statsS, stdevOpt));
 
-        dSo->data.F32[i] = sqrt(dEsquare);
+        if (isfinite(dEsquare)) {
+            float err = sqrtf(dEsquare);
+            if (err < min) {
+                min = err;
+            }
+        }
     }
     psFree (dE0subset);
@@ -851 +854 @@
     psFree (mkSubset);
 
-    psStats *minStats = psStatsAlloc(PS_STAT_MIN);
-    psVectorStats(minStats, dSo, NULL, NULL, 0);
-    *errorFloor = minStats->min;
-    psFree(minStats);
-
     psFree(index);
-    psFree (dSo);
-
-    psFree (statsS);
+
+    psFree(statsS);
 
     return true;