Changeset 40165 for trunk/Ohana/src/opihi

Timestamp:

Oct 11, 2017, 10:10:18 AM (9 years ago)

Author:

eugene

Message:

add floating-mean periodogram; convert style elements to enums; add bar plots; extend number of active JobIDs

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.astro/cdot.c (modified) (1 diff)
• src/opihi/cmd.astro/cgrid.c (modified) (1 diff)
• src/opihi/cmd.astro/cline.c (modified) (1 diff)
• src/opihi/cmd.astro/czplot.c (modified) (2 diffs)
• src/opihi/cmd.data/Makefile (modified) (1 diff)
• src/opihi/cmd.data/dot.c (modified) (1 diff)
• src/opihi/cmd.data/grid.c (modified) (1 diff)
• src/opihi/cmd.data/init.c (modified) (2 diffs)
• src/opihi/cmd.data/line.c (modified) (1 diff)
• src/opihi/cmd.data/periodogram-fm.c (copied) (copied from branches/eam_branches/ohana.20170822/src/opihi/cmd.data/periodogram-fm.c )
• src/opihi/cmd.data/test/periodogram-fm.sh (copied) (copied from branches/eam_branches/ohana.20170822/src/opihi/cmd.data/test/periodogram-fm.sh )
• src/opihi/cmd.data/test/periodogram.sh (modified) (3 diffs)
• src/opihi/cmd.data/zplot.c (modified) (2 diffs)
• src/opihi/dvo/catalog.c (modified) (1 diff)
• src/opihi/dvo/dmt.c (modified) (1 diff)
• src/opihi/dvo/fitcolors.c (modified) (4 diffs)
• src/opihi/dvo/fitsed.c (modified) (1 diff)
• src/opihi/dvo/images.c (modified) (1 diff)
• src/opihi/dvo/imbox.c (modified) (1 diff)
• src/opihi/dvo/imdense.c (modified) (1 diff)
• src/opihi/dvo/imstats.c (modified) (1 diff)
• src/opihi/dvo/paverage.c (modified) (1 diff)
• src/opihi/dvo/pmeasure.c (modified) (1 diff)
• src/opihi/dvo/procks.c (modified) (2 diffs)
• src/opihi/dvo/showtile.c (modified) (1 diff)
• src/opihi/dvo/simage.c (modified) (1 diff)
• src/opihi/dvo/skycat.c (modified) (1 diff)
• src/opihi/pantasks/JobIDOps.c (modified) (1 diff)
• src/opihi/pantasks/test/nice_remote.sh (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.astro/cdot.c

@@ -22 +22 @@
 
   /* set point style and errorbar mode (these are NOT sticky) */
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.etype = 0;
 

trunk/Ohana/src/opihi/cmd.astro/cgrid.c

@@ -276 +276 @@
   /* send the line segments as connect-points */
   Xvec.Nelements = Yvec.Nelements = N;
-  graphmode.style = 2; /* points */
-  graphmode.ptype = 100; /* connect a pair */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
+  graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
   graphmode.etype = 0;
   PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);

trunk/Ohana/src/opihi/cmd.astro/cline.c

@@ -20 +20 @@
 
   /* set point style and errorbar mode (these are NOT sticky) */
-  graphmode.style = 0;
+  graphmode.style = KAPA_PLOT_CONNECT;
   graphmode.etype = 0;
 

trunk/Ohana/src/opihi/cmd.astro/czplot.c

@@ -111 +111 @@
   Zvec.Nelements = Npts;
 
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.size = -1; /* point size determined by Zvec */
   graphmode.etype = 0;
@@ -236 +236 @@
   Zvec.Nelements = Npts;
 
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS;
   graphmode.color = -1; /* point color determined by Zvec */
   graphmode.etype = 0;

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -102 +102 @@
 $(SRC)/peak.$(ARCH).o           \
 $(SRC)/periodogram.$(ARCH).o    \
+$(SRC)/periodogram-fm.$(ARCH).o \
 $(SRC)/plot.$(ARCH).o           \
 $(SRC)/dot.$(ARCH).o            \

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

@@ -29 +29 @@
 
   /* set point style and errorbar mode (these are NOT sticky) */
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS;
   graphmode.etype = 0;
 

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

@@ -175 +175 @@
 
   Xvec.Nelements = Yvec.Nelements = N;
-  graphmode.style = 2; /* points */
-  graphmode.ptype = 100; /* connect a pair */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
+  graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
   graphmode.etype = 0;
   PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);

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

@@ -91 +91 @@
 int peak             PROTO((int, char **));
 int periodogram      PROTO((int, char **));
+int periodogram_fm   PROTO((int, char **));
 int plot             PROTO((int, char **));
 int dot              PROTO((int, char **));
@@ -270 +271 @@
   {1, "parity",       parity,           "set image parity"},
   {1, "peak",         peak,             "find vector peak in range"},
-  {1, "periodogram",  periodogram,      "measure periods in unevenly sampled data"},
+  {1, "periodogram",    periodogram,    "measure periods in unevenly sampled data (Lomb-Scargle)"},
+  {1, "periodogram_fm", periodogram_fm, "measure periods in unevenly sampled data (generalized Lomb-Scargle; floating mean)"},
   {1, "plot",         plot,             "plot a pair of vectors"},
   {1, "png",          jpeg,             "convert display graphic to PNG"},

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

@@ -33 +33 @@
 
   /* set point style and errorbar mode (these are NOT sticky) */
-  graphmode.style = 0;
+  graphmode.style = KAPA_PLOT_CONNECT;
   graphmode.etype = 0;
 

trunk/Ohana/src/opihi/cmd.data/test/periodogram.sh

@@ +1 @@
+
+if (not($?PLOT)) set PLOT = 0
 
 list tests
@@ -28 +30 @@
    echo "OFFSET: {$peakpos - $P}"
  end
+
+ if ($PLOT)
+  lim period power; clear; box; line -c red70 -lw 3 $P 0 to $P $peakval; plot period power -x line
+ end
 end
 
@@ -99 +105 @@
 
  periodogram t f 2 30 period power
+
+#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
+#  lim -n 1 period power; clear; box; plot period power
+
+ peak -q period power
+
+ if (abs ($peakpos - $P) > 0.05)
+   $PASS = 0
+ end
+end
+
+# test using random samples, offset start, non-zero DC
+macro test5
+ $PASS = 1
+ break -auto off
+
+ local P PI
+ $PI = 3.14159265359
+ $P  = 15.0
+
+ delete -q x t f period power
+
+ create x 500 800
+ set t = 300 * rnd(x) + 500
+ set f = sin(2*$PI*t/$P) + 0.5
+
+ periodogram t f 2 30 period power
+
+#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
+#  lim -n 1 period power; clear; box; plot period power
+
+ peak -q period power
+
+ if (abs ($peakpos - $P) > 0.05)
+   $PASS = 0
+ end
+end
+
+# test using random samples, offset start, non-zero DC, some noise
+macro test6
+ $PASS = 1
+ break -auto off
+
+ local P PI
+ $PI = 3.14159265359
+ $P  = 15.0
+
+ delete -q x t f period power
+
+ create x 500 800
+ set t = 300 * rnd(x) + 500
+ set fraw = sin(2*$PI*t/$P) + 0.5
+
+ # 0.05 : peakpos = 14.95
+ # 0.10 : peakpos = 15.04 (
+ gaussdev df t[] 0.0 0.25
+ set f = fraw + df
+
+ periodogram t f 2 30 period power
+
+#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
+#  lim -n 1 period power; clear; box; plot period power
+
+ peak -q period power
+
+ if (abs ($peakpos - $P) > 0.05)
+   $PASS = 0
+ end
+end
+
+# test using fewer random samples, offset start, non-zero DC, some noise
+macro test7
+ $PASS = 1
+ break -auto off
+
+ local P PI
+ $PI = 3.14159265359
+ $P  = 15.0
+
+ delete -q x t f period power
+
+ create x 0 100
+ set t = 100 * rnd(x)
+ set fraw = sin(2*$PI*t/$P) + 0.5
+
+ # 0.05 : peakpos = 14.95
+ # 0.10 : peakpos = 15.04 (
+ gaussdev df t[] 0.0 0.25
+ set f = fraw + df
+
+ periodogram t f 2 30 period power
+
+#  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f
+#  lim -n 1 period power; clear; box; plot period power
+
+ peak -q period power
+
+ if (abs ($peakpos - $P) > 0.05)
+   $PASS = 0
+ end
+end
+
+# test using fewer random samples, high frequency, non-zero DC, some noise
+macro test8
+ if ($0 != 2)
+   echo "USAGE: test8: Ndays")
+   break
+ end
+ 
+ local Ndays 
+ $Ndays = $1
+
+ $PASS = 1
+ break -auto off
+
+ local P PI
+ $PI = 3.14159265359
+ $P  = 0.8*rnd(0) + 0.2
+ $trueP = $P
+
+ delete -q x t f period power
+
+ create x 0 $Ndays
+
+ # t is a time in days, but we always have 4 within 1 hour:
+ set t0 = int(100 * rnd(x))
+ set dtx = (3/24) * rnd(x)
+ set t0 = t0 + dtx
+
+ set dt1 = (15.0 / 1440) * rnd(x) + ( 0 + 7.5) / 1440
+ set dt2 = (15.0 / 1440) * rnd(x) + (15 + 7.5) / 1440
+ set dt3 = (15.0 / 1440) * rnd(x) + (30 + 7.5) / 1440
+
+ delete -q t
+ concat t0 t
+ set tmp = t0 + dt1; concat tmp t
+ set tmp = t0 + dt2; concat tmp t
+ set tmp = t0 + dt3; concat tmp t
+
+ set fraw = sin(2*$PI*t/$P) + 0.5
+
+ # 0.05 : peakpos = 14.95
+ # 0.10 : peakpos = 15.04 (
+ gaussdev df t[] 0.0 0.25
+ set f = fraw + df
+
+ periodogram t f 0.1 2.0 period power
 
 #  lim -n 0 t f; clear; box; plot -x 2 -pt 2 t f

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

@@ -117 +117 @@
 
   /* point size determined by Zvec */
-  graphmode.style = 2; /* plot points */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.size = -1; /* point size determined by Zvec */
   PlotVectorTriplet (kapa, xvec, yvec, &Zvec, mask, &graphmode);
@@ -226 +226 @@
 
   /* point size determined by Zvec */
-  graphmode.style = 2; /* plot points */
+  graphmode.style = KAPA_PLOT_POINTS; /* plot points */
   graphmode.color = -1; /* point color determined by Zvec */
   graphmode.etype = 0; /* no errorbars */

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

@@ -390 +390 @@
     REALLOCATE (Zvec.elements, float, MAX (Zvec.Nelements, 1));
     
-    graphmode.style = 2; /* set style to points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
     graphmode.size = -1; /* point size determined by Zvec */
     graphmode.etype = 0; /* no errorbars */

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

@@ -150 +150 @@
     vec5[0].Nelements = Dvec.Nelements;
   } else {
-    graphmode.style = 2; /* set style to points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
     PlotVector (kapa, N, Xvec.elements, Yvec.elements, &graphmode);
 

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

@@ -92 +92 @@
     graphdata.ymin = minDelta;
     graphdata.ymax = maxDelta;
-    graphdata.style = 2;
-    graphdata.ptype = 2;
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_CIRCLE_SOLID; /* connect pairs of points */
     KapaClearSections (kapa);
     KapaSetFont (kapa, "helvetica", 14);
@@ -192 +192 @@
     graphdata.ymin = minDelta;
     graphdata.ymax = maxDelta;
-    graphdata.style = 2;
-    graphdata.ptype = 2;
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_CIRCLE_SOLID; /* connect pairs of points */
   }
 
@@ -315 +315 @@
           deltaFit[i] = C0 + C1*colorFit[i];
         }
-        graphdata.style = 0;
+        graphmode.style = KAPA_PLOT_CONNECT; /* lines */
         graphdata.color = KapaColorByName ("red");
 
@@ -329 +329 @@
         KapaSetFont (kapa, "helvetica", 14);
 
-        graphdata.style = 2;
+        graphmode.style = KAPA_PLOT_POINTS; /* points */
         graphdata.color = KapaColorByName ("black");
 

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

@@ -157 +157 @@
     if (!GetGraph (&graphdata, &kapa, NULL)) return (FALSE);
     SetLimitsRaw (wavecode, NULL, Nfilter, &graphdata);
-    graphdata.style = 2;
-    graphdata.ptype = 2;
+    graphdata.style = KAPA_PLOT_POINTS; /* points */
+    graphdata.ptype = KAPA_POINT_CIRCLE_SOLID;
     KapaClearSections (kapa);
     magSection.name = strcreate ("mag");

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

@@ -352 +352 @@
   Xvec.Nelements = Yvec.Nelements = N;
   if (N > 0) {
-    graphmode.style = 2; /* points */
-    graphmode.ptype = 100; /* connect pairs of points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);

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

@@ -156 +156 @@
   Xvec.Nelements = Yvec.Nelements = Npts;
   if (Npts > 0) {
-    graphmode.style = 2; /* points */
-    graphmode.ptype = 100; /* connect pairs of points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);

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

@@ -59 +59 @@
   Xvec.Nelements = Yvec.Nelements = N;
   if (N > 0) {
-    graphmode.style = 2; /* points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);

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

@@ -51 +51 @@
   if (AutoLimits) SetLimits (&Xvec, &Yvec, &graphmode);
 
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.etype = 0;
   PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);

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

@@ -81 +81 @@
     return (FALSE);
   }
-  graphmode.style = 2; /* set style to points */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.size = -1; /* point size determined by Zvec */
   graphmode.etype = 0; /* no errorbars */

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

@@ -154 +154 @@
     return (FALSE);
   }
-  graphmode.style = 2; /* set style to points */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.size = -1; /* point size determined by Zvec */
   graphmode.etype = 0; /* no errorbars */

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

@@ -111 +111 @@
   Yvec.Nelements = Xvec.Nelements = N;
   
-  graphmode.style = 2; /* set style to points */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.etype = 0; /* no errorbars */
   PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
@@ -142 +142 @@
   Yvec.Nelements = Xvec.Nelements = N;
   
-  graphmode.style = 2; /* set style to points */
-  graphmode.ptype = 100; /* connect pairs */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
+  graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
   graphmode.etype = 0; /* no errorbars */
 

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

@@ -78 +78 @@
   Xvec.Nelements = Yvec.Nelements = N;
   if (N > 0) {
-    graphmode.style = 2; /* points */
-    graphmode.ptype = 100; /* connect pairs of points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);

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

@@ -118 +118 @@
   }
 
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS;
   graphmode.size = -1;
   graphmode.etype = 0;

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

@@ -121 +121 @@
   Xvec.Nelements = Yvec.Nelements = Npts;
   if (Npts > 0) {
-    graphmode.style = 2; /* points */
-    graphmode.ptype = 100; /* connect pairs of points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);

trunk/Ohana/src/opihi/pantasks/JobIDOps.c

@@ -1 +1 @@
 # include "pantasks.h"
 
-# define MAX_N_JOBS 10000
+# define MAX_N_JOBS 50000
 static char *JobIDList;
 static int   JobIDPtr;

trunk/Ohana/src/opihi/pantasks/test/nice_remote.sh

@@ -10 +10 @@
   periods      -timeout 20
   active       true
-  npending 5
+  npending 50
   
   stdout tmp.txt
@@ -38 +38 @@
 task           meantask_local
   command      sleep 10
-  host         anyhost
+  host         local
 
   periods      -poll 0.1
@@ -44 +44 @@
   periods      -timeout 20
   active       true
-  npending 5
+  npending 50
   
   stdout tmp.txt