Changeset 28840

Timestamp:

Aug 4, 2010, 3:14:33 PM (16 years ago)

Author:

bills

Message:

measurements for new objects with NSTAR_GROUP > 1 were not getting assigned to objects correctly. Fix by using the unsorted lists as the sources. They are in the desired order.

Location:

trunk/Ohana/src/addstar/src

Files:

• find_matches.c (modified) (3 diffs)
• find_matches_closest.c (modified) (3 diffs)

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

@@ -247 +247 @@
     }
 
-    N = N1[i];
-    if (stars[N].found >= 0) continue;
-    if (!IN_REGION (stars[N].average.R, stars[N].average.D)) continue;
-
-    catalog[0].average[Nave].R             = stars[N].average.R;
-    catalog[0].average[Nave].D             = stars[N].average.D;
+    if (stars[i].found >= 0) continue;
+    if (!IN_REGION (stars[i].average.R, stars[i].average.D)) continue;
+
+    catalog[0].average[Nave].R             = stars[i].average.R;
+    catalog[0].average[Nave].D             = stars[i].average.D;
     catalog[0].average[Nave].dR            = 0;
     catalog[0].average[Nave].dD            = 0;
@@ -303 +302 @@
     for (j = 0; j < NSTAR_GROUP; j++) {
       // supply the measurments from this detection
-      catalog[0].measure[Nmeas]           = stars[N].measure;
-      N = N1[i + j];
+      catalog[0].measure[Nmeas]           = stars[i + j].measure;
 
       // the following measure elements cannot be set until here:
@@ -322 +320 @@
       /* next[Nmeas] should always be -1 in this context (it is always the only
          measurement for the star) */
-      stars[N].found = Nmeas;
+      stars[i].found = Nmeas;
       next_meas[Nmeas] = -1;  // initial value here update below
       Nmeas ++;

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

@@ -242 +242 @@
     }
 
-    N = N1[i];
-    if (stars[N].found >= 0) continue;
-    if (!IN_REGION (stars[N].average.R, stars[N].average.D)) continue;
-
-    catalog[0].average[Nave].R             = stars[N].average.R;
-    catalog[0].average[Nave].D             = stars[N].average.D;
+    if (stars[i].found >= 0) continue;
+    if (!IN_REGION (stars[i].average.R, stars[i].average.D)) continue;
+
+    catalog[0].average[Nave].R             = stars[i].average.R;
+    catalog[0].average[Nave].D             = stars[i].average.D;
     catalog[0].average[Nave].dR            = 0;
     catalog[0].average[Nave].dD            = 0;
@@ -297 +296 @@
     for (j = 0; j < NSTAR_GROUP; j++) {
         // supply the measurments from this detection
-        catalog[0].measure[Nmeas]           = stars[N].measure;
-        N = N1[i + j];
+        catalog[0].measure[Nmeas]           = stars[i + j].measure;
 
         // the following measure elements cannot be set until here:
@@ -316 +314 @@
         /* next[Nmeas] should always be -1 in this context (it is always the only
            measurement for the star) */
-        stars[N].found = Nmeas;
+        stars[i+j].found = Nmeas;
         next_meas[Nmeas] = -1;  // inital value here update below
         Nmeas ++;