Changeset 35712

Timestamp:

Jun 26, 2013, 5:51:52 AM (13 years ago)

Author:

eugene

Message:

add some testing prints and fix tmax

Location:

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src

Files:

• ImageSubsetFixLAP.c (modified) (1 diff)
• delete_fix_LAP.c (modified) (5 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/ImageSubsetFixLAP.c

@@ -208 +208 @@
     subset[i].trate    = image[i].trate    ;
     subset[i].tmin     = image[i].tzero - 1;
-    subset[i].tmax     = image[i].trate*image[i].NY + 1;
+    subset[i].tmax     = image[i].tzero + image[i].trate*image[i].NY + 1;
     subset[i].photcode = image[i].photcode ;
   }

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delete_fix_LAP.c

@@ -328 +328 @@
     measureOffsetOK &= (catalog[0].average[i].measureOffset + catalog[0].average[i].Nmeasure <= catalog[0].Nmeasure);
     if (VERBOSE2 && !(catalog[0].average[i].measureOffset + catalog[0].average[i].Nmeasure <= catalog[0].Nmeasure)) {
-      fprintf (stderr, "orrset + Nmeasure too large: %d + %d > %d %d\n", (int) i, catalog[0].average[i].measureOffset, catalog[0].average[i].Nmeasure, (int) catalog[0].Nmeasure);
+      fprintf (stderr, "offset + Nmeasure too large: %d + %d > %d %d\n", (int) i, catalog[0].average[i].measureOffset, catalog[0].average[i].Nmeasure, (int) catalog[0].Nmeasure);
     }
     m = catalog[0].average[i].measureOffset;
@@ -454 +454 @@
     // for gpc1 exposures, 10000 < photcode < 10600
     if ((10000 < measure[j].photcode) && (measure[j].photcode < 10600)) {
-      int resetID = FALSE;
+      // int resetID = FALSE;
+      int resetID = TRUE;
       off_t imageID = measure[j].imageID;
       if (imageID == 0) {
@@ -474 +475 @@
       }
 
+      if (!resetID) {
+        // off_t N = measure[j].averef;
+        // fprintf (stderr, "no repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
+      } 
+
     resetID_exp:
       if (resetID) {
+        off_t N = measure[j].averef;
+        fprintf (stderr, "repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
         // update the image ID
         short photcode = measure[j].photcode;
@@ -495 +503 @@
     // for gpc1 exposures, 10000 < photcode < 10600
     if ((11000 <= measure[j].photcode) && (measure[j].photcode < 11600)) {
-      int resetID = FALSE;
+      // int resetID = FALSE;
+      int resetID = TRUE;
       off_t imageID = measure[j].imageID;
       if (imageID == 0) {
@@ -520 +529 @@
     resetID_stk:
       if (resetID) {
+        off_t N = measure[j].averef;
+        fprintf (stderr, "repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
         // update the image ID
         off_t imageID, Seq;