Changeset 38627

Timestamp:

Jul 23, 2015, 7:36:37 AM (11 years ago)

Author:

eugene

Message:

attempt to show problem with bad object; add asserts to avoid invalid db

Location:

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src

Files:

• build_links.c (modified) (1 diff)
• dvoverify_utils.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/build_links.c

@@ -145 +145 @@
     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();
       tmpmeasure[N] = measure[n]; 
-      if (measure[n].averef != i) abort();
+      myAssert (measure[n].averef == i, "error in averef?");
+      myAssert (measure[n].objID == myObjID, "error in objID?");
       tmpmeasure[N].averef = i;
       n = next_meas[n];

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -323 +323 @@
 
           // check if objID matches R,D
-          int iTest = catalog.measure[m+j].objID;
+          Measure *measure = &catalog.measure[m+j];
+          int iTest = measure->objID;
           if (catalog.average[iTest].objID == iTest) {
-            double dR = 3600.0*(catalog.average[iTest].R - catalog.measure[m+j].R) * cos (RAD_DEG*catalog.measure[m+j].D);
-            double dD = 3600.0*(catalog.average[iTest].D - catalog.measure[m+j].D);
+            double dR = 3600.0*(catalog.average[iTest].R - measure->R) * cos (RAD_DEG*measure->D);
+            double dD = 3600.0*(catalog.average[iTest].D - measure->D);
             double dRad = hypot (dR, dD);
-            fprintf (stderr, "matches ave %d = %d, %f, %f = %f\n", iTest, catalog.measure[m+j].objID, dR, dD, dRad);
+            char *date = ohana_sec_to_date (measure->t);
+            fprintf (stderr, "matches ave %d = %d, %s : %6.3f %5d : %f, %f = %f\n", iTest, measure->objID, date, measure->M, measure->photcode, dR, dD, dRad);
+            free (date);
           } else {
             fprintf (stderr, "cannot find averef\n");