Changeset 27839 for branches/simmosaic_branches/Ohana/src/delstar/src/delete_orphans.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/delstar/src/delete_orphans.c (modified) (6 diffs)

branches/simmosaic_branches/Ohana/src/delstar/src/delete_orphans.c

@@ -3 +3 @@
 delete_orphans (char *name) {
 
-  int i, j, k, n, m, N, M, found;
-  int *N1, *N2,  *next, *next_miss, *ave_miss, last, last_miss;
-  int Nave, NAVE, Nmeas, NMEAS, Nmiss, NMISS, Nmatch;
-  int start, end, Nmeasfound, Nsecfilt;
+  off_t i, j, k, n, m, Nmeasfound, Nsecfilt, N, M, found;
+  off_t *next_meas, *next_miss, *ave_miss, last, last_miss;
+  off_t Nave, NAVE, Nmeas, NMEAS, Nmiss, NMISS, Nmatch;
+  e_time start, end;
   unsigned int flags;
   Measure *tmpmeasure;
@@ -26 +26 @@
 
   Nmeas = catalog.Nmeasure;
-  ALLOCATE (next, int, Nmeas);
+  ALLOCATE (next_meas, int, Nmeas);
   
   Nmiss = catalog.Nmissing;
@@ -36 +36 @@
   /* set up pointers for linked list of measure */
   for (i = 0; i < Nmeas - 1; i++) {
-    next[i] = i+1;
-  }
-  next[i] = -1;
+    next_meas[i] = i+1;
+  }
+  next_meas[i] = -1;
   last = i;
   /* set up pointers for linked list of missing */
@@ -60 +60 @@
       /* this star is an orphan */
       Nmeasfound ++;
-      next[i] = -2; /* we delete this one */
+      next_meas[i] = -2; /* we delete this one */
       /* fix the list links: connect the previous valid link to the next valid link */
-      for (j = i; (j >= 0) && (next[j] == -2); j--); /* find previous entry to fix link */
+      for (j = i; (j >= 0) && (next_meas[j] == -2); j--); /* find previous entry to fix link */
       if (j >= 0) { /* if j < 0, there is no previous valid link, ignore this step */
-        if (next[j] != i) {
+        if (next_meas[j] != i) {
           fprintf (stderr, "error?  this link seems to have been lost\n");
           exit (1);
         }
         /* find next valid entry to fix link */
-        for (k = i; (k < Nmeas) && (next[k] == -2); k++);
+        for (k = i; (k < Nmeas) && (next_meas[k] == -2); k++);
         if (k < Nmeas)
-          next[j] = k;
+          next_meas[j] = k;
         else 
-          next[j] = -1;  /* last link in list gets a -1 */
+          next_meas[j] = -1;  /* last link in list gets a -1 */
       }
       
@@ -111 +111 @@
         m = catalog.average[n].offset;
         /* find next valid entry -- notice lack of error checking... */
-        for (j = 0; (j < Nmeas) && (next[m+j] == -2); j++);
+        for (j = 0; (j < Nmeas) && (next_meas[m+j] == -2); j++);
         catalog.average[n].offset = m + j;
       }
@@ -218 +218 @@
       tmpmeasure[N] = catalog.measure[n]; 
       tmpmeasure[N].averef = i;
-      n = next[n];
+      n = next_meas[n];
     }
   }