Changeset 40398 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Apr 14, 2018, 2:27:25 PM (8 years ago)

Author:

eugene

Message:

add avperiodogram function; fix sorts to put NAN at one end; fix impeaks and findrowpeaks to ignore NAN values

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• impeaks.c (modified) (1 diff)
• sort.c (modified) (2 diffs)

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

@@ -100 +100 @@
   int Npeaks = 0;
   for (ix = 1; ix < Nx - 1; ix++) {
+    if (!isfinite(row[ix])) continue; // ignore NAN values
     if (row[ix] <  threshold) continue;   // only accept pixels above threshold
     if (row[ix] <  row[ix - 1]) continue; // peak pixel must be at least preceeding pixel

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

@@ -7 +7 @@
   itmp = IDX[A]; IDX[A] = IDX[B]; IDX[B] = itmp; \
 }
-# define COMPARE(A,B)(X[A] < X[B])
+
+// # define COMPARE(A,B)(X[A] < X[B])
+# define COMPARE(A,B)((!isfinite(X[A]) && isfinite(X[B])) || (X[A] < X[B]))
 
   OHANA_SORT (N, COMPARE, SWAPFUNC);
@@ -22 +24 @@
   itmp = IDX[A]; IDX[A] = IDX[B]; IDX[B] = itmp; \
 }
+
 # define COMPARE(A,B)(X[A] < X[B])
+// # define COMPARE(A,B)((!isfinite(X[A]) && isfinite(X[B])) || (X[A] < X[B]))
 
   OHANA_SORT (N, COMPARE, SWAPFUNC);