Changeset 21064 for trunk/Ohana

Timestamp:

Dec 30, 2008, 10:17:54 AM (18 years ago)

Author:

eugene

Message:

ignore nan and inf in the opihi rebin function

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• init.c (modified) (2 diffs)
• rebin.c (modified) (2 diffs)

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

@@ -7 +7 @@
 int book_command     PROTO((int, char **));
 int center           PROTO((int, char **));
+int parity           PROTO((int, char **));
 int circstats        PROTO((int, char **));
 int clear            PROTO((int, char **));
@@ -128 +129 @@
   {1, "book",         book_command,     "commands to manipulate book/page/word data"},
   {1, "center",       center,           "center image on coords"},
+  {1, "parity",       parity,           "set image parity"},
   {1, "circstats",    circstats,        "circular statistics"},
   {1, "clear",        clear,            "erase plot"},

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

@@ -128 +128 @@
           for (i = 0; i < nx; i++, Vout++) {
             for (x = 0; x < n; x++, Vin++) {
+              if (isnan(*Vin)) continue;
+              if (isinf(*Vin)) continue;
               if (Ignore && (*Vin == IgnoreValue)) continue;
               *Vout += *Vin;
@@ -144 +146 @@
           if (Normalize) { Vn = Npix + j*nx; }
           for (i = 0; i < in[0].header.Naxis[0]; i++, Vin++) {
-            if (Ignore && (*Vin == IgnoreValue)) { 
+            if (isnan(*Vin) || isinf(*Vin) || (Ignore && (*Vin == IgnoreValue))) { 
               Vout += n; 
               if (Normalize) Vn += n;