Changeset 34361 for trunk

Timestamp:

Aug 28, 2012, 2:11:59 PM (14 years ago)

Author:

bills

Message:

fix bug in addstar in which a source gets matched to objects in 2 catalog files.
The fix is to repair the logic where star->found is set.

found >= 0 measurement matched to current catalog
found == -1 not matched anywhere yet
found == -2 found in a previously processed catalog

Location:

trunk/Ohana/src/addstar/src

Files:

• find_matches.c (modified) (1 diff)
• find_matches_closest.c (modified) (3 diffs)
• find_matches_closest_refstars.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/find_matches.c

@@ -313 +313 @@
     if (stars[i].found > -1) {
       stars[i].found = -2;
-    } else {
-      stars[i].found = -3;
     }
   }

trunk/Ohana/src/addstar/src/find_matches_closest.c

@@ -130 +130 @@
       j++;
       continue;
+    }
+
+    if (stars[N1[i]].found != -1) {
+        /* this star has already been assigned to an object in this or another catalog */
+        i++;
+        continue;
     }
 
@@ -249 +255 @@
     }
 
-    if (stars[i].found >= 0) continue;
+    if (stars[i].found != -1) continue;
     if (!IN_REGION (stars[i].average.R, stars[i].average.D)) continue;
 
@@ -315 +321 @@
     if (stars[i].found > -1) {
       stars[i].found = -2;
-    } else {
-      stars[i].found = -3;
     }
   }

trunk/Ohana/src/addstar/src/find_matches_closest_refstars.c

@@ -320 +320 @@
     if (stars[i][0].found > -1) {
       stars[i][0].found = -2;
-    } else {
-      stars[i][0].found = -3;
     }
   }