Changeset 36022

Timestamp:

Aug 25, 2013, 12:10:07 PM (13 years ago)

Author:

eugene

Message:

add join, fix vlist argument, update help for match2d

Location:

branches/eam_branches/ipp-20130711/Ohana/src

Files:

• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/src/dvosorts.c (modified) (1 diff)
• opihi/cmd.data/Makefile (modified) (1 diff)
• opihi/cmd.data/init.c (modified) (2 diffs)
• opihi/cmd.data/join.c (added)
• opihi/cmd.data/match2d.c (modified) (3 diffs)
• opihi/cmd.data/vlist.c (modified) (1 diff)

branches/eam_branches/ipp-20130711/Ohana/src/libdvo/include/dvo.h

@@ -696 +696 @@
 void sort_coords_index (double *X, double *Y, off_t *S, off_t N);
 void sort_coords_indexonly (double *X, double *Y, off_t *S, off_t N);
+void sort_IDs_indexonly (opihi_int *X, off_t *S, off_t N);
 void sort_regions (SkyRegion *region, off_t N);
 

branches/eam_branches/ipp-20130711/Ohana/src/libdvo/src/dvosorts.c

@@ -60 +60 @@
 
 /* sort a coordinate pair (X,Y) and the associated index (S) */
+void sort_IDs_indexonly (opihi_int *X, off_t *S, off_t N) {
+  
+# define SWAPFUNC(A,B){ off_t itmp; \
+  itmp = S[A]; S[A] = S[B]; S[B] = itmp; \
+}
+# define COMPARE(A,B)(X[S[A]] < X[S[B]])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+/* sort a coordinate pair (X,Y) and the associated index (S) */
 void sort_coords_indexonly (double *X, double *Y, off_t *S, off_t N) {
   

branches/eam_branches/ipp-20130711/Ohana/src/opihi/cmd.data/Makefile

@@ -66 +66 @@
 $(SRC)/integrate.$(ARCH).o      \
 $(SRC)/interpolate.$(ARCH).o    \
+$(SRC)/join.$(ARCH).o           \
 $(SRC)/jpeg.$(ARCH).o           \
 $(SRC)/kern.$(ARCH).o           \

branches/eam_branches/ipp-20130711/Ohana/src/opihi/cmd.data/init.c

@@ -55 +55 @@
 int integrate        PROTO((int, char **));
 int interpolate      PROTO((int, char **));
+int join             PROTO((int, char **));
 int jpeg             PROTO((int, char **));
 int kern             PROTO((int, char **));
@@ -210 +211 @@
   {1, "integrate",    integrate,        "integrate a vector"},
   {1, "interpolate",  interpolate,      "interpolate between vector pairs"},
+  {1, "join",         join,             "find the join of two ID vectors"},
   {1, "jpeg",         jpeg,             "convert display image to JPEG"},
   {1, "kern",         kern,             "convolve with 3x3 kernel"},

branches/eam_branches/ipp-20130711/Ohana/src/opihi/cmd.data/match2d.c

@@ -14 +14 @@
   Vector *index1, *index2;
 
+  if ((N = get_argument (argc, argv, "-h"))) goto usage;
+  if ((N = get_argument (argc, argv, "--help"))) goto usage;
+
   CLOSEST = FALSE;
   if ((N = get_argument (argc, argv, "-closest"))) {
@@ -38 +41 @@
   if (argc != 6) {
     gprint (GP_ERR, "USAGE: match2d X1 Y1 X2 Y2 Radius [-index1 (index1)] [-index2 (index2)] [-closest]\n");
-    gprint (GP_ERR, "  if -closest is provided, index1 & index2 will have the same length as X1 and X2 (respectively)\n");
-    gprint (GP_ERR, "    with either the index of the match or a value of -1 for non-matches\n");
+    gprint (GP_ERR, "  use -h or --help for more detail\n");
     return (FALSE);
   }
@@ -90 +92 @@
 
   return (TRUE);
+
+usage:
+  gprint (GP_ERR, "we have two modes of operation:\n\n");
+
+  gprint (GP_ERR, "without -closest, we are finding all matched pairs within the match radius.  in this\n");
+  gprint (GP_ERR, "case, the two index vectors have the same length, one entry per matched pair.\n");
+  gprint (GP_ERR, "x1[index1],y1[index1] matches to x2[index2],y2[index2].\n\n");
+
+  gprint (GP_ERR, "with -closest selected, we are finding the closest element of set 1 to each of set 2\n");
+  gprint (GP_ERR, "and vice versa.  in this case, index1 is always the same length as x1,y1, while index2\n");
+  gprint (GP_ERR, "is the same lengths as x2,y2.  x2[index1],y2[index1] matches x1,y1 while\n");
+  gprint (GP_ERR, "x1[index2],y1[index2] matches x2,y2\n\n");
+
+  gprint (GP_ERR, "if -index1 or -index2 is not supplied, the vectors are created with names index1 or index2\n");
+  gprint (GP_ERR, "use 'reindex' to generate new vectors based on these index vectors\n");
+
+  return FALSE;
 }
 

branches/eam_branches/ipp-20130711/Ohana/src/opihi/cmd.data/vlist.c

@@ -19 +19 @@
     }
     INT = TRUE;
+    remove_argument (N, &argc, argv);
   }