Changeset 27724

Timestamp:

Apr 21, 2010, 4:06:21 PM (16 years ago)

Author:

eugene

Message:

N and n were not being correctly set

File:

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

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

@@ -10 +10 @@
 int merge_catalogs_old (SkyRegion *region, Catalog *output, Catalog *input, double RADIUS) {
 
-  off_t i, j, n, N, Nin, offset, J, Jmin, status, Nstars;
+  off_t i, j, Nin, offset, J, Jmin, status, Nstars;
   double RADIUS2, Rmin, Rin, Din;
   double *X1, *Y1, *X2, *Y2;
@@ -152 +152 @@
     /*** a match is found, add to average, measure ***/
     Nmatch ++;
-    n = N2[Jmin];
-    N = N1[i];
+    off_t n = N2[Jmin];
+    off_t N = N1[i];
 
     /* make sure there is space for next Nmeasure entries */
@@ -223 +223 @@
   /* these new entries are all written out in UPDATE mode */ 
   for (i = 0; i < Nstars; i++) {
+    off_t N = N1[i];
+
     /* make sure there is space for next entry */
     if (Nmeas + input[0].average[N].Nmeasure >= NMEAS) {
@@ -235 +237 @@
     }
 
-    N = N1[i];
     if (input[0].found[N] >= 0) continue;
     if (!IN_REGION (input[0].average[N].R, input[0].average[N].D)) continue;