Changeset 39262 for trunk/Ohana/src/dvomerge

Timestamp:

Dec 12, 2015, 8:38:47 PM (11 years ago)

Author:

eugene

Message:

updates for Mflat

File:

• trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c (modified) (8 diffs)

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -85 +85 @@
     N1[Nstars] = i;
     Nstars ++;
-    input[0].found_t[i] = -1;
+    input[0].found_t[i] = FALSE;
   }
   if (Nstars < 1) {
@@ -180 +180 @@
     off_t N = N1[i];
 
+    input[0].found_t[N] = TRUE;
+
     /* make sure there is space for next Nmeasure entries */
     if (Nmeas + input[0].average[N].Nmeasure >= NMEAS) {
@@ -209 +211 @@
       Nreplace = replace_tycho (&output[0].average[n], output[0].measure, next_meas, &input[0].average[N], &input[0].measure[Minp]);
       if (Nreplace == 6) {
-        input[0].found_t[N] = Nmeas;
         output[0].found_t[n] = Nmeas;
         i++;
@@ -224 +225 @@
         // XXX this does not support lensing, starpar, or galphot measurements
         if (replace_match (&output[0].average[n], output[0].measure, next_meas, &input[0].average[N], &input[0].measure[offset])) {
-          input[0].found_t[N] = output[0].average[n].measureOffset;  
           continue;
         }
@@ -274 +274 @@
         }
       }
-      input[0].found_t[N] = Nmeas;
       output[0].average[n].Nmeasure ++;
       Nmeas ++;
@@ -394 +393 @@
     }
 
-    if (input[0].found_t[N] >= 0) continue;
+    if (input[0].found_t[N]) continue;
 
     // if we are using MATCHED_TABLES, we are going to leave the edge cases in their
     // source catalog, even if they have leaked beyond the edge
     if (!MATCHED_TABLES && !IN_REGION (input[0].average[N].R, input[0].average[N].D)) continue;
+
+    input[0].found_t[N] = TRUE;
 
     // XXX should we accept the input measurements for these fields?
@@ -450 +451 @@
 
       /* we set next[Nmeas] to -1 here, and update correctly below */
-      input[0].found_t[N] = Nmeas;
       next_meas[Nmeas] = -1;
       Nmeas ++;
@@ -559 +559 @@
   }
 
-  /* note stars which have been found in this catalog */
-  for (i = 0; i < input[0].Naverage; i++) {
-    if (input[0].found_t[i] > -1) {
-      input[0].found_t[i] = -2;
-    } else {
-      input[0].found_t[i] = -3;
-    }
-  }
-
   /* check if the catalog has changed?  if no change, no need to write */
   output[0].objID    = objID; // new max value, save on catalog close