Changeset 39624 for trunk

Timestamp:

Jul 3, 2016, 12:11:08 PM (10 years ago)

Author:

eugene

Message:

do not abort on image-time mismatch

Location:

trunk/Ohana/src/relastro/src

Files:

• RepairStackMeasures.c (modified) (1 diff)
• UpdateMeasures.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/RepairStackMeasures.c

@@ -93 +93 @@
       // check match of obstime:
       if ((measureB->t != image[idx].tzero) && (result.NstackMissTime < 10)) {
-        fprintf (stderr, "inconsistent stack measurement times: %d vs %d for %f, %f (%d, %ld)", measureB->t, image[idx].tzero, Rstk, Dstk, measureB->photcode, extID); 
+        fprintf (stderr, "inconsistent stack measurement times: %d vs %d for %f, %f (%d, %ld)\n", measureB->t, image[idx].tzero, Rstk, Dstk, measureB->photcode, extID); 
         result.NstackMissTime ++;
       }

trunk/Ohana/src/relastro/src/UpdateMeasures.c

@@ -51 +51 @@
 
       // check that we have the right image:
+# if (0)
       myAssert (measureT->photcode == image[im].photcode, "image photcode mismatch");
       myAssert (measureT->t >= image[im].tzero, "image time mismatch (1)");
       myAssert (measureT->t <= image[im].tzero + image[im].NX*image[im].trate/5000.0, "image time mismatch (2)");
+# endif
       // I'm allowing the trate*NX to be a factor of 2x too small