Changeset 40398 for trunk

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

Files:

• cmd.data/impeaks.c (modified) (1 diff)
• cmd.data/sort.c (modified) (2 diffs)
• dvo/Makefile (modified) (1 diff)
• dvo/avperiodogram.c (added)
• dvo/init.c (modified) (2 diffs)
• lib.data/starfuncs.c (modified) (5 diffs)
• mana/findrowpeaks.c (modified) (1 diff)

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);

trunk/Ohana/src/opihi/dvo/Makefile

@@ -45 +45 @@
 $(SRC)/avextract.$(ARCH).o              \
 $(SRC)/avmatch.$(ARCH).o                \
+$(SRC)/avperiodogram.$(ARCH).o          \
 $(SRC)/badimages.$(ARCH).o              \
 $(SRC)/catdir.$(ARCH).o                 \

trunk/Ohana/src/opihi/dvo/init.c

@@ -3 +3 @@
 int avextract       PROTO((int, char **));
 int avmatch         PROTO((int, char **));
+int avperiodogram   PROTO((int, char **));
 int badimages       PROTO((int, char **));
 int calextract      PROTO((int, char **));
@@ -67 +68 @@
   {1, "avextract",   avextract,    "extract average data values"},
   {1, "avmatch",     avmatch,      "extract average data values matched to RA,DEC points"},
+  {1, "avperiodogram", avperiodogram, "perform periodogram on objects based on restrictions"},
   {1, "badimages",   badimages,    "look for images with anomalous astrometry"},
 //  {1, "calextract",  calextract,   "extract photometry calibration"},

trunk/Ohana/src/opihi/lib.data/starfuncs.c

@@ -285 +285 @@
     off = j*Nx;
     for (i = Xs; i < Xe; i++) { 
+      if (!isfinite(data[i+off])) continue;
       sky[Nsky] = data[i+off];
       Nsky ++;
@@ -294 +295 @@
     off = j*Nx;
     for (i = Xs; i < Xe; i++) { 
+      if (!isfinite(data[i+off])) continue;
       sky[Nsky] = data[i+off];
       Nsky ++;
@@ -305 +307 @@
     off = j*Nx;
     for (i = Xs; i < Xe; i++) { 
+      if (!isfinite(data[i+off])) continue;
       sky[Nsky] = data[i+off];
       Nsky ++;
@@ -314 +317 @@
     off = j*Nx;
     for (i = Xs; i < Xe; i++) { 
+      if (!isfinite(data[i+off])) continue;
       sky[Nsky] = data[i+off];
       Nsky ++;
@@ -341 +345 @@
       rad2 = SQ(Xc) + SQ(Yc);
       if (rad2 > Ro2) continue;
+      // if (!isfinite(data[i+off])) continue;
       value = data[i+off] - fsky;
       Sx  += Xc*value;

trunk/Ohana/src/opihi/mana/findrowpeaks.c

@@ -23 +23 @@
 
   for (i = 1; i < Nrow - 1; i++) {
+    if (!isfinite(row[i])) continue; // ignore NAN values
     if (row[i] < threshold) continue;
     if (row[i] < row[i-1]) continue;