Changeset 27610

Timestamp:

Apr 5, 2010, 3:47:10 PM (16 years ago)

Author:

eugene

Message:

fixing avmatch

Location:

trunk/Ohana/src/opihi/dvo

Files:

• avmatch.c (modified) (5 diffs)
• find_matches.c (modified) (4 diffs)
• skyregion.c (modified) (1 diff)

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

@@ -83 +83 @@
     if ((vec[i] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) goto escape;
     ResetVector (vec[i], fields[i].type, NPTS);
+    for (n = 0; n < vec[i][0].Nelements; n++) {
+      if (vec[i][0].type == OPIHI_FLT) {
+        vec[i][0].elements.Flt[n] = NAN;
+      } else {
+        vec[i][0].elements.Int[n] = 0; // or NAN_INT?
+      }
+    }
   }
   ALLOCATE (index, off_t, NPTS);
@@ -103 +110 @@
     }
     dvo_catalog_unlock (&catalog);  /// we can unlock here since this is read-only (do not block other access)
+    if (catalog.Naverage == 0) {
+      dvo_catalog_free (&catalog);
+      continue;
+    }
 
     find_matches_by_vectors (skylist[0].regions[i], &catalog, RAvec, DECvec, RADIUS, index);
@@ -111 +122 @@
 
       if (Ncat == -1) continue;
-      if (Ncat == -2) {
-        for (n = 0; n < Nfields; n++) {
-          if (vec[n][0].type == OPIHI_FLT) {
-            vec[n][0].elements.Flt[Npts] = NAN;
-          } else {
-            vec[n][0].elements.Int[Npts] = 0; // or NAN_INT?
-          }
-        }
-        continue;
-      }
+      if (Ncat == -2) continue;
+
       // XXX set a 'found' vector to double check we catch everything?
       m = catalog.average[Ncat].measureOffset;
@@ -148 +151 @@
   dbFreeFields (fields, Nfields);
   SkyListFree (skylist);
-  dvo_catalog_free (&catalog);
   return (TRUE);
 
@@ -156 +158 @@
   dbFreeFields (fields, Nfields);
   SkyListFree (skylist);
-  dvo_catalog_free (&catalog);
   return (FALSE);
 

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

@@ -7 +7 @@
 int find_matches_by_vectors (SkyRegion *region, Catalog *catalog, Vector *RAvec, Vector *DECvec, float RADIUS, off_t *index) {
 
-  off_t i, j, J, Jmin, n, N, Npoints;
+  off_t i, j, J, Jmin, Npoints, Nmatch;
   off_t *N1, *N2;
   double *X1, *Y1, *X2, *Y2;
@@ -16 +16 @@
   Coords tcoords;
 
-  assert(catalog[0].sorted);
+  // XXX dvoconvert does not correctly maintain 'sorted' 
+  // assert(catalog[0].sorted);
 
   Npoints = RAvec->Nelements;
+  Nmatch = 0;
 
   /** allocate local arrays (points) **/
@@ -80 +82 @@
   RADIUS2 = RADIUS*RADIUS;
 
-# define NEXTi { i++; continue; }                                                                                                                                                
-# define NEXTj { j++; continue; }                                                                                                                                                
+# define NEXTi { i++; continue; }
+# define NEXTj { j++; continue; }
                                                                                                                                                                                  
   /** find matched stars **/
   for (i = j = 0; (i < Npoints) && (j < Nave); ) {
-    if (index[i] == -1) NEXTi;
+    if (index[N1[i]] == -1) NEXTi;
     if (!finite(X1[i]) || !finite(Y1[i])) NEXTi;
     if (!finite(X2[j]) || !finite(Y2[j])) NEXTj;
@@ -112 +114 @@
 
     /* no match, try next detection */ 
-    if (Jmin == -1) NEXTi;
+    if (Jmin == -1) {
+      NEXTi;
+    }
 
     /*** a match is found, set the index for this entry ***/
-    n = N2[Jmin];
-    N = N1[i];
-    index[N] = n;
+    index[N1[i]] = N2[Jmin];
+
+    Nmatch ++;
 
     NEXTi;

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

@@ -140 +140 @@
     }
   }
+  list[0].Nregions = Nout;
 
   free (found);