Changeset 27610 for trunk/Ohana/src/opihi/dvo/find_matches.c

Timestamp:

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

Author:

eugene

Message:

fixing avmatch

File:

• trunk/Ohana/src/opihi/dvo/find_matches.c (modified) (4 diffs)

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;