Changeset 39346 for trunk

Timestamp:

Feb 12, 2016, 9:23:13 AM (10 years ago)

Author:

eugene

Message:

allow addstar with average->Nmeasure = 0

File:

• trunk/Ohana/src/addstar/src/build_links.c (modified) (4 diffs)

trunk/Ohana/src/addstar/src/build_links.c

@@ -34 +34 @@
 
   ALLOCATE (next_meas, off_t, Nmeasure);
-  for (i = 0; i < Naverage; i++, N++) {
+  for (i = 0; i < Naverage; i++) {
+    if (!average[i].Nmeasure) continue;
     for (j = 0; j < average[i].Nmeasure - 1; j++, N++) {
       next_meas[N] = N + 1;
@@ -45 +46 @@
       fprintf (stderr, "WARNING: N out of bounds (2)\n");
     }
-
     if (N >= Nmeasure) {
       myAbort ("overflow in init_measure_links\n");
     }
+    N++;
   }
   return (next_meas);
@@ -168 +169 @@
   ALLOCATE (next_miss, off_t, Nmissing);
   for (i = 0; i < Naverage; i++) {
+    if (!average[i].Nmissing) continue;
     for (j = 0; j < average[i].Nmissing - 1; j++, N++) {
       next_miss[N] = N + 1;
     }
-    if (average[i].Nmissing > 0) {
-      next_miss[N] = -1;
-      if (N >= Nmissing) {
-        myAbort ("overflow in init_missing_links");
-      }
-      N++;
-    }
-
+    next_miss[N] = -1;
+    if (N >= Nmissing) {
+      myAbort ("overflow in init_missing_links");
+    }
+    N++;
   }
   return (next_miss);
@@ -249 +248 @@
       fprintf (stderr, "WARNING: N out of bounds (2)\n");
     }
-
     if (N >= Nlensing) {
       myAbort ("overflow in init_lensing_links\n");