Changeset 34398 for branches/eam_branches/ipp-20120805/Ohana

Timestamp:

Sep 5, 2012, 3:56:32 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120805/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/find_matches.c (modified) (1 diff)
• src/addstar/src/find_matches_closest.c (modified) (3 diffs)
• src/addstar/src/find_matches_closest_refstars.c (modified) (1 diff)
• src/opihi/cmd.astro (modified) (1 prop)

branches/eam_branches/ipp-20120805/Ohana/src/addstar/src/find_matches.c

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

branches/eam_branches/ipp-20120805/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;
     }
   }

branches/eam_branches/ipp-20120805/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;
     }
   }