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

Timestamp:

Mar 18, 2006, 5:26:07 PM (20 years ago)

Author:

eugene

Message:

added periodogram, tests, some minor bugs

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• Makefile (modified) (1 diff)
• init.c (modified) (2 diffs)
• peak.c (modified) (3 diffs)
• periodogram.c (added)
• test (added)
• test/peak.sh (added)
• test/periodogram.sh (added)
• write_vectors.c (modified) (1 diff)

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

@@ -68 +68 @@
 $(SDIR)/mset.$(ARCH).o          \
 $(SDIR)/peak.$(ARCH).o          \
+$(SDIR)/periodogram.$(ARCH).o   \
 $(SDIR)/plot.$(ARCH).o          \
 $(SDIR)/dot.$(ARCH).o           \

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

@@ -53 +53 @@
 int mset             PROTO((int, char **));
 int peak             PROTO((int, char **));
+int periodogram      PROTO((int, char **));
 int plot             PROTO((int, char **));
 int dot              PROTO((int, char **));
@@ -160 +161 @@
   {"mset",         mset,             "insert a vector in a matrix"},
   {"peak",         peak,             "find vector peak in range"},
+  {"periodogram",  periodogram,      "measure periods in unevenly sampled data"},
   {"plot",         plot,             "plot a pair of vectors"},
   {"dot",          dot,              "plot a single point"},

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

@@ -3 +3 @@
 int peak (int argc, char **argv) {
   
-  int i, imax;
+  int i, N, imax, QUIET;
   double start, end, xmax, ymax;
   float *X, *Y;
   Vector *vecx, *vecy;
 
-  if (argc != 5) {
-    fprintf (stderr, "USAGE: peak <x> <y> start end\n");
+  QUIET = FALSE;
+  if ((N = get_argument (argc, argv, "-q"))) {
+    QUIET = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  if ((argc != 5) && (argc != 3)) {
+    fprintf (stderr, "USAGE: peak <x> <y> [start end]\n");
     return (FALSE);
   }
@@ -16 +22 @@
   if ((vecy = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return (FALSE);
 
-  start = atof (argv[3]);
-  end   = atof (argv[4]);
+  if (argc == 5) {
+    start = atof (argv[3]);
+    end   = atof (argv[4]);
+  } else {
+    start = vecx[0].elements[0];
+    end   = vecx[0].elements[vecx[0].Nelements - 1];
+  }
 
   X = vecx[0].elements;
@@ -39 +50 @@
   set_variable ("peaknum", imax);
 
-  fprintf (stderr, "peak %f @ %f (%d)\n", ymax, xmax, imax);
+  if (!QUIET) fprintf (GetOutfile(), "peak %f @ %f (%d)\n", ymax, xmax, imax);
 
   return (TRUE);
 }
-

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

@@ -41 +41 @@
   for (i = 0; i < Nvec; i++) {
     if ((vec[i] = SelectVector (argv[i + 2], OLDVECTOR, FALSE)) == NULL) {
+      fprintf (stderr, "unknown vector %s\n", argv[i+2]);
       fprintf (stderr, "USAGE: write (file) vector vector ...\n");
       free (vec);