Changeset 39143

Timestamp:

Nov 15, 2015, 7:30:43 PM (11 years ago)

Author:

eugene

Message:

update dvomerge to merge measure, lensing, starpar, galphot with the same method

File:

• trunk/Ohana/src/dvomerge/src/build_links.c (modified) (15 diffs)

trunk/Ohana/src/dvomerge/src/build_links.c

@@ -36 +36 @@
 
   ALLOCATE (next_meas, off_t, Nmeasure);
-  for (i = 0; i < Naverage; i++, N++) {
+  for (i = 0; i < Naverage; i++) {
+    if (!average[i].Nmeasure) continue;
+    off_t m = average[i].measureOffset;
+    myAssert (measure[m].averef == i, "not sorted");
     for (j = 0; j < average[i].Nmeasure - 1; j++, N++) {
+      myAssert (measure[m+j+1].averef == i, "not sorted");
       next_meas[N] = N + 1;
       if (N >= Nmeasure) {
@@ -52 +56 @@
       abort ();
     }
+    N++;
   }
   return (next_meas);
@@ -124 +129 @@
   }
 
-  if (m == -1) {
+  // if Nmeasure is 0, m may have been mis-set; add to the end
+  if ((average[0].Nmeasure == 0) || (m == -1)) {
     average[0].measureOffset = Nmeasure;
   } else {
@@ -138 +144 @@
 Measure *sort_measure (Average *average, off_t Naverage, Measure *measure, off_t Nmeasure, off_t *next_meas) {
 
-  off_t i, k, n, N;
+  off_t i, k, n, np, N;
   Measure *tmpmeasure;
 
   /* fix order of Measure (memory intensive, but fast) */
+  np = -1; // previous entry in case of errors
   N = 0; 
   ALLOCATE (tmpmeasure, Measure, Nmeasure);
   for (i = 0; i < Naverage; i++) {
+    if (!average[i].Nmeasure) continue;
     n = average[i].measureOffset;
     average[i].measureOffset = N;
     int myObjID = average[i].objID;
     for (k = 0; k < average[i].Nmeasure; k++, N++) {
-      if (n == -1) abort();
+      if (n == -1) {
+        fprintf (stderr, "entry after %d has a problem\n", (int) np);
+        abort();
+      }
       tmpmeasure[N] = measure[n]; 
       myAssert (measure[n].averef == i, "error in averef?");
       myAssert (measure[n].objID == myObjID, "error in objID?");
       tmpmeasure[N].averef = i;
+      np = n;
       n = next_meas[n];
     }
@@ -354 +366 @@
   Lensing *tmplensing;
 
-  /*
-  for (i = 0; i < Naverage; i++) {
-    if (average[i].Nlensing != 4) {
-      fprintf (stderr, "check %d %d %d\n", (int) i, (int) average[i].Nlensing, (int) average[i].lensingOffset);
-    }
-  }
-  */
-
   /* fix order of Lensing (memory intensive, but fast) */
   np = -1;
@@ -370 +374 @@
     n = average[i].lensingOffset;
     average[i].lensingOffset = N;
+    int myObjID = average[i].objID;
     for (k = 0; k < average[i].Nlensing; k++, N++) {
       if (n == -1) {
@@ -376 +381 @@
       }
       tmplensing[N] = lensing[n]; 
-      if (lensing[n].averef != i) abort();
+      myAssert (lensing[n].averef == i, "error in averef");
+      myAssert (lensing[n].objID == myObjID, "error in objID?");
       tmplensing[N].averef = i;
       np = n;
@@ -400 +406 @@
   for (i = 0; i < Naverage; i++) {
     if (!average[i].Nstarpar) continue;
+    off_t m = average[i].starparOffset;
+    myAssert (starpar[m].averef == i, "not sorted");
     for (j = 0; j < average[i].Nstarpar - 1; j++, N++) {
+      myAssert (starpar[m+j+1].averef == i, "not sorted");
       next_star[N] = N + 1;
       if (N >= Nstarpar) {
@@ -488 +497 @@
   }
 
-  if (m == -1) {
+  // if Nmeasure is 0, m may have been mis-set; add to the end
+  if ((average[0].Nstarpar == 0) || (m == -1)) {
     average[0].starparOffset = Nstarpar;
   } else {
@@ -505 +515 @@
   StarPar *tmpstarpar;
 
-  /*
-  for (i = 0; i < Naverage; i++) {
-    if (average[i].Nstarpar != 4) {
-      fprintf (stderr, "check %d %d %d\n", (int) i, (int) average[i].Nstarpar, (int) average[i].starparOffset);
-    }
-  }
-  */
-
   /* fix order of StarPar (memory intensive, but fast) */
-  np = -1;
+  np = -1; // previous entry in case of errors
   N = 0; 
   ALLOCATE (tmpstarpar, StarPar, Nstarpar);
@@ -521 +523 @@
     n = average[i].starparOffset;
     average[i].starparOffset = N;
+    int myObjID = average[i].objID;
     for (k = 0; k < average[i].Nstarpar; k++, N++) {
       if (n == -1) {
@@ -527 +530 @@
       }
       tmpstarpar[N] = starpar[n]; 
-      if (starpar[n].averef != i) abort();
+      myAssert (starpar[n].averef == i, "error in averef?");
+      myAssert (starpar[n].objID == myObjID, "error in objID?");
       tmpstarpar[N].averef = i;
       np = n;
@@ -660 +664 @@
   GalPhot *tmpgalphot;
 
-  /*
-  for (i = 0; i < Naverage; i++) {
-    if (average[i].Ngalphot != 4) {
-      fprintf (stderr, "check %d %d %d\n", (int) i, (int) average[i].Ngalphot, (int) average[i].galphotOffset);
-    }
-  }
-  */
-
   /* fix order of GalPhot (memory intensive, but fast) */
   np = -1;
@@ -676 +672 @@
     n = average[i].galphotOffset;
     average[i].galphotOffset = N;
+    int myObjID = average[i].objID;
     for (k = 0; k < average[i].Ngalphot; k++, N++) {
       if (n == -1) {
@@ -682 +679 @@
       }
       tmpgalphot[N] = galphot[n]; 
-      if (galphot[n].averef != i) abort();
+      myAssert (galphot[n].averef == i, "error in averef?");
+      myAssert (galphot[n].objID == myObjID, "error in objID?");
       tmpgalphot[N].averef = i;
       np = n;