Changeset 39474 for trunk/Ohana/src/relastro/src/RepairWarpMeasures.c

Timestamp:

Mar 23, 2016, 12:26:55 PM (10 years ago)

Author:

eugene

Message:

finish code to repair warps

File:

• trunk/Ohana/src/relastro/src/RepairWarpMeasures.c (modified) (4 diffs)

trunk/Ohana/src/relastro/src/RepairWarpMeasures.c

@@ -9 +9 @@
   myAssert (!catalog->Nmeasure || catalog->measure, "programming error");
 
+  int NfixChipID = 0, NfixStackID = 0, NfixWarpID = 0, NfixWarpImageID = 0, NmissWarp = 0, NmissStack = 0, NbadWarp = 0;
+
+  int onePercent = catalog->Nmeasure / 100;
+
   for (off_t j = 0; j < catalog->Nmeasure; j++) {
+    if (j % onePercent == 0) fprintf (stderr, ".");
+
     Measure *measure = &catalog->measure[j];
 
-    // we are only going to repair warp detections
-    if (!isGPC1warp(measure->photcode))  {
-      // XXX fix extID
+    // repair extID for non-warps:
+    if (isGPC1chip(measure->photcode))  {
+      double mjd = ohana_sec_to_mjd (measure->t);
+      int ccdnum = measure->photcode % 100;
+      uint64_t extID = CreatePSPSDetectionID (mjd, ccdnum, measure->detID);
+      if (extID != measure->extID) {
+        measure->extID = extID;
+        NfixChipID ++;
+      }
       continue;
     }
+
+    // repair extID for non-warps:
+    if (isGPC1stack(measure->photcode))  {
+      int im = getImageByID (measure->imageID);
+      if (im < 0) {
+        if (NmissStack < 10) fprintf (stderr, "missing stack exposure: %f %f : %d %d\n", measure->R, measure->D, measure->imageID, measure->photcode);
+        NmissStack ++;
+        continue;
+      }
+      uint64_t extID = CreatePSPSStackDetectionID (35, image[im].externID, measure->detID);
+      if (extID != measure->extID) {
+        measure->extID = extID;
+        NfixStackID ++;
+      }
+      continue;
+    }
+
+    // we are only going to repair warp detections
+    if (!isGPC1warp(measure->photcode)) continue;
 
     // get the associated average value:
@@ -23 +54 @@
 
     // double-check for consistency
-    myAssert (average->objID == measure->objID, "mismatch");
+    myAssert (average->objID == measure->objID, "objID mismatch: %f %f : %d %d\n", average->R, average->D, average->objID, measure->objID);
+
+    // warp coordinates to confirm warp
+    double X = measure->Xccd;
+    double Y = measure->Yccd;
 
     // check if this detection is far from its correct location
@@ -39 +74 @@
 
     // skip detections which are within a small distance of the expected location
+    // NOTE: this actually works surprisingly well near the pole
     double dPos = hypot(dR,dD);
-    if (dPos < 2.0) continue;
-
-    // warp coordinates to confirm warp
-    double X = measure->Xccd;
-    double Y = measure->Yccd;
+    if (dPos < 2.0) { 
+      int im = getImageByID (measure->imageID);
+      uint64_t extID = CreatePSPSStackDetectionID (34, image[im].externID, measure->detID);
+      if (extID != measure->extID) {
+        measure->extID = extID;
+        NfixWarpID ++;
+      }
+      continue;
+    }
 
     // find the corrected warp ID:
-    int warpID = GetWarpID (image, measure->t, measure->photcode, Rave, Dave, X, Y);
-    myAssert (warpID >= 0, "error finding match");
+    int warpSeq = GetWarpSeq (image, measure->t, measure->photcode, Rave, Dave, X, Y);
+    if (warpSeq < 0) {
+      if (NmissWarp < 10) fprintf (stderr, "missing warp exposure: %f %f : %d %d\n", Rave, Dave, measure->t, measure->photcode);
+      NmissWarp ++;
+      continue;
+    }
 
     // assert on coords being TAN?
-    Coords *imcoords = &image[warpID].coords;
+    Coords *imcoords = &image[warpSeq].coords;
 
     double Rnew, Dnew;
@@ -63 +107 @@
     double dDnew = 3600.0*(Dnew - Dave);
 
-    // skip detections which are within a small distance of the expected location
+    // detections should now be repaired; fail if not
     dPos = hypot(dRnew,dDnew);
-    if (dPos > 2.0) {
-      // complain. abort?
-      fprintf (stderr, "measurement still far from average location\n");
-      abort();
+    if (dPos > 5.0) {
+      fprintf (stderr, "measurement still far from average location: %f %f vs %f %f : %d %d\n", Rave, Dave, Rnew, Dnew, measure->t, measure->photcode);
+      NbadWarp ++;
     }
 
+    measure->imageID = image[warpSeq].imageID;
     measure->R = Rnew;
     measure->D = Dnew;
 
-    // XXX fix extID
+    uint64_t extID = CreatePSPSStackDetectionID (34, image[warpSeq].externID, measure->detID);
+    if (extID != measure->extID) {
+      measure->extID = extID;
+      NfixWarpID ++;
+    }
+    NfixWarpImageID ++;
   }
+
+  fprintf (stderr, "\n");
+  fprintf (stderr, "repaired %s : warp image ID %d : ext ID chip %d stack %d warp %d : missed warp %d stack %d : bad warp: %d\n", catalog->filename, NfixWarpImageID, NfixChipID, NfixStackID, NfixWarpID, NmissWarp, NmissStack, NbadWarp);
+
   return (TRUE);
 }