Changeset 20533

Timestamp:

Nov 4, 2008, 4:28:07 PM (18 years ago)

Author:

eugene

Message:

skip nan and inf

File:

• trunk/Ohana/src/opihi/cmd.data/stats.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.data/stats.c

@@ -57 +57 @@
   }
 
-  max = min = *((float *)(buf[0].matrix.buffer) + sy*buf[0].matrix.Naxis[0] + sx);
+  max = -1e32;
+  min = +1e32;
   for (j = sy; j < sy + ny; j++) {
     V = (float *)(buf[0].matrix.buffer) + j*buf[0].matrix.Naxis[0] + sx; 
     for (i = 0; i < nx; i++, V++) {
       if (Ignore && (fabs (*V - IgnoreValue) < 1e-8)) continue;
+      if (isnan(*V)) continue;
+      if (isinf(*V)) continue;
       N1 += *V;
       N2 += (*V)*(*V);
@@ -81 +84 @@
       for (i = 0; i < nx; i++, V++) {
         if (Ignore && (fabs (*V - IgnoreValue) < 1e-8)) continue;
+        if (isnan(*V)) continue;
+        if (isinf(*V)) continue;
         bin = MIN (MAX (0, (*V - min) * range), 0xffff);
         hist[bin] ++;