Changeset 16810 for trunk/Ohana/src/delstar/src/find_matches.c

Timestamp:

Mar 4, 2008, 12:39:41 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080223 : updates to DVO output format, addstar (SDSS and 2MASS flags), relastro (FitChip)

File:

• trunk/Ohana/src/delstar/src/find_matches.c (modified) (7 diffs)

trunk/Ohana/src/delstar/src/find_matches.c

@@ -37 +37 @@
   /* set up references for missing to average */
   for (i = 0; i < Nave; i++) {
-    for (j = 0; j < catalog[0].average[i].Nn; j++) {
-      ave_miss[catalog[0].average[i].missing + j] = i;
+    for (j = 0; j < catalog[0].average[i].Nmissing; j++) {
+      ave_miss[catalog[0].average[i].missingOffset + j] = i;
     }
   }
@@ -88 +88 @@
     /*** fix the corresponding average entry ***/
     n = catalog[0].measure[i].averef;
-    if (catalog[0].average[n].Nm == 0) { /* this should never happen */
+    if (catalog[0].average[n].Nmeasure == 0) { /* this should never happen */
       fprintf (stderr, "error? we deleted one too many objects?\n");
       exit (1);
     }
-    catalog[0].average[n].Nm --;
+    catalog[0].average[n].Nmeasure --;
     /* this was only entry in list: will be deleted below.  meanwhile, delete all missing entries*/
-    if ((catalog[0].average[n].Nm < 1) && (catalog[0].average[n].Nn > 0)) { 
-      m = catalog[0].average[n].missing;
-      for (j = 0; j < catalog[0].average[n].Nn; j++) {
+    if ((catalog[0].average[n].Nmeasure < 1) && (catalog[0].average[n].Nmissing > 0)) { 
+      m = catalog[0].average[n].missingOffset;
+      for (j = 0; j < catalog[0].average[n].Nmissing; j++) {
         M = next_miss[m];
         next_miss[m] = -2;
         m = M;
       }
-      m = catalog[0].average[n].missing;
+      m = catalog[0].average[n].missingOffset;
       /* fix the list links: connect the previous valid link to the next valid link */
       for (j = m; (j >= 0) && (next_miss[j] == -2); j--); /* find previous entry to fix link */
@@ -119 +119 @@
     }
     /* this was first entry in list */
-    if ((catalog[0].average[n].offset == i) && (catalog[0].average[n].Nm > 0)) { 
-      m = catalog[0].average[n].offset;
+    if ((catalog[0].average[n].measureOffset == i) && (catalog[0].average[n].Nmeasure > 0)) { 
+      m = catalog[0].average[n].measureOffset;
       /* find next valid entry -- notice lack of error checking... */
       for (j = 0; (j < Nmeas) && (next[m+j] == -2); j++);
-      catalog[0].average[n].offset = m + j;
+      catalog[0].average[n].measureOffset = m + j;
     }
   } 
@@ -154 +154 @@
     /*** fix the corresponding average entry ***/
     n = ave_miss[i];
-    if (catalog[0].average[n].Nn == 0) { /* this should never happen */
+    if (catalog[0].average[n].Nmissing == 0) { /* this should never happen */
       fprintf (stderr, "error? we deleted one too many missing?\n");
       exit (1);
     }
-    catalog[0].average[n].Nn --;
+    catalog[0].average[n].Nmissing --;
     /* this was first entry in list */
-    if ((catalog[0].average[n].missing == i) && (catalog[0].average[n].Nn > 0)) { 
-      m = catalog[0].average[n].missing;
+    if ((catalog[0].average[n].missingOffset == i) && (catalog[0].average[n].Nmissing > 0)) { 
+      m = catalog[0].average[n].missingOffset;
       for (j = 0; (j < Nmiss) && (next_miss[m+j] == -2); j++);
-      catalog[0].average[n].missing = m + j;
+      catalog[0].average[n].missingOffset = m + j;
     }
   }
@@ -172 +172 @@
   /* fix Average list: delete entries with Nm == 0 */
   for (i = j = 0; (i < Nave) && (j < Nave); i++, j++) {
-    for (; (j < Nave) && (catalog[0].average[j].Nm == 0); j++);
+    for (; (j < Nave) && (catalog[0].average[j].Nmeasure == 0); j++);
     if ((i != j) && (j < Nave)) {
       catalog[0].average[i] = catalog[0].average[j];
@@ -189 +189 @@
   ALLOCATE (tmpmeasure, Measure, Nmeas);
   for (i = 0; i < Nave; i++) {
-    n = catalog[0].average[i].offset;
-    catalog[0].average[i].offset = N;
-    for (k = 0; k < catalog[0].average[i].Nm; k++, N++) {
+    n = catalog[0].average[i].measureOffset;
+    catalog[0].average[i].measureOffset = N;
+    for (k = 0; k < catalog[0].average[i].Nmeasure; k++, N++) {
       if ((n == -1) || (n == -2)) {
         fprintf (stderr, "error: linked list is confused\n");
@@ -211 +211 @@
   ALLOCATE (tmpmissing, Missing, Nmiss);
   for (i = 0; i < Nave; i++) {
-    if (catalog[0].average[i].Nn > 0) {
-      n = catalog[0].average[i].missing;
-      catalog[0].average[i].missing = N;
-      for (k = 0; k < catalog[0].average[i].Nn; k++, N++) {
+    if (catalog[0].average[i].Nmissing > 0) {
+      n = catalog[0].average[i].missingOffset;
+      catalog[0].average[i].missingOffset = N;
+      for (k = 0; k < catalog[0].average[i].Nmissing; k++, N++) {
         if ((n == -1) || (n == -2)) {
           fprintf (stderr, "error: linked list is confused\n");