Changeset 40523 for trunk/Ohana/src/opihi/dvo/mmatch.c

Timestamp:

Aug 30, 2018, 5:07:23 PM (8 years ago)

Author:

eugene

Message:

add avselect function to dvo (returns all matched objects within a radius of a list of points)

File:

• trunk/Ohana/src/opihi/dvo/mmatch.c (modified) (5 diffs)

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

@@ -84 +84 @@
 
   // parse the fields to be extracted and returned
-  int first = 3;
-  if (CoordsFile) {
-    first = 1;
-  }
+  // this is a syntax check that we can perform before reading the input vectors
+  // NOTE: This block is missing in avmatch / avselect
+  int first = CoordsFile ? 1 : 3;
   fields = dbCmdlineFields (argc-first, &argv[first], DVO_TABLE_MEASURE, &last, &Nfields);
   if (fields == NULL) goto help;
@@ -166 +165 @@
     }      
 
+    // NOTE: image metadata is only needed to mmatch (not avmatch) since measures are tied to images, not averages
     if (loadImages) {
       Image *image;
@@ -245 +245 @@
     char hostfile[1024];
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
+
     dvo_catalog_init (&catalog, TRUE);
     catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
@@ -265 +266 @@
 
     // returns the matches to AVERAGE objects; what do we do for each MEASURE?
-    find_matches_by_vectors (skylist[0].regions[i], &catalog, RAvec, DECvec, RADIUS, index);
+    find_matches_by_vectors_closest (skylist[0].regions[i], &catalog, RAvec, DECvec, RADIUS, index);
 
     for (j = 0; (j < Nelem) && !interrupt; j++) {
@@ -331 +332 @@
   ClearInterrupt (old_sigaction);
 
+  // XXXX ???? this seems odd
   for (n = 0; n < Nfields; n++) {
     ResetVector (vec[n], fields[n].type, Npts);