Changeset 27488

Timestamp:

Mar 26, 2010, 4:43:50 PM (16 years ago)

Author:

eugene

Message:

updates to handle image coordinate failures

Location:

branches/eam_branches/relastro.20100326/src

Files:

• CoordOps.c (added)
• FitChip.c (modified) (4 diffs)
• FixProblemImages.c (added)
• ImageOps.c (modified) (4 diffs)
• UpdateChips.c (modified) (2 diffs)
• UpdateObjectOffsets.c (modified) (1 diff)
• fitpoly.c (modified) (6 diffs)
• mkpolyterm.c (modified) (1 diff)
• relastro.c (modified) (2 diffs)

branches/eam_branches/relastro.20100326/src/FitChip.c

@@ -22 +22 @@
   CoordFit *fit;
   double dL, dM, dR, dRmax, *values;
+  Coords oldCoords;
 
   ALLOCATE (values, double, Nmatch);
@@ -84 +85 @@
       default:
         fprintf (stderr, "invalid chip order %d\n", coords[0].Npolyterms);
-        abort ();
+        skip = TRUE;
     }
     if (skip) {
@@ -96 +97 @@
 
     // measure the fit, update the coords & object coordinates
-    fit_eval (fit);
-    fit_apply_coords (fit, coords);
+    if (!fit_eval (fit)) {
+      fprintf (stderr, "failed to fit new model\n");
+      return FALSE;
+    }
+
+    if (!fit_apply_coords (fit, coords)) {
+      fprintf (stderr, "failed to fit new model\n");
+      return FALSE;
+    }
+
     fit_free (fit);
 
@@ -107 +116 @@
 
   free (values);
-  return;
+  return TRUE;
 }
 

branches/eam_branches/relastro.20100326/src/ImageOps.c

@@ -286 +286 @@
   Coords *moscoords, *imcoords;
 
+  // check if this image is bad and should be skipped
+  if (badCoords(im)) return;
+
   moscoords = NULL;
   mosaic = getMosaicForImage (im);
@@ -292 +295 @@
   }
   imcoords = &image[im].coords;
+
+  // accumulate the rms position offsets.  if this value, or any specific entry, is too
+  // large, we will reset the image to the original coords at the end of the analysis
+
+  dPos = 0.0;
+  nPos = 0;
 
   for (i = 0; i < Nlist[im]; i++) {
@@ -317 +326 @@
 
     if (fabs(catalog[c].measure[m].dR - dR) > 10.0) {
-      // XXXXX running into this still for last megacam exposure: wrong mosaic?
-      // ???? inconsistently hitting this????
       fprintf (stderr, "!");
-      // abort ();
+      setBadCoords (im); // report a failure for this image
+      return;
     }
     if (fabs(catalog[c].measure[m].dD - dD) > 10.0) {
       fprintf (stderr, "*");
-      // abort ();
-    }
+      setBadCoords (im); // report a failure for this image
+      return;
+    }
+
+    dPos += SQ(catalog[c].measure[m].dR - dR) + SQ(catalog[c].measure[m].dD - dD);
+    nPos ++;
 
     catalog[c].measure[m].dR = dR;
@@ -341 +353 @@
     }
   }
+
+  saveOffsets (dPos, nPos, im);
+
   return;
 }

branches/eam_branches/relastro.20100326/src/UpdateChips.c

@@ -7 +7 @@
   Image *image;
   StarData *raw, *ref;
+  Coords *oldCoords;
 
   image = getimages (&Nimage);
@@ -24 +25 @@
     assert (Nraw == Nref);
 
+    saveCoords (&image[i].coords, i);
+
     // FitChip does iterative, clipped fitting
     fprintf (stderr, "image %lld : Nstars: %lld\n", (long long) i, (long long) Nraw);
-    FitChip (raw, ref, Nraw, &image[i].coords);
+    if (!FitChip (raw, ref, Nraw, &image[i].coords)) {
+      oldCoords = getCoords (i);
+      memcpy (&image[i].coords, oldCoords, sizeof(Coords));
+    }
 
     free (raw);

branches/eam_branches/relastro.20100326/src/UpdateObjectOffsets.c

@@ -1 +1 @@
 # include "relastro.h"
+
+// We run through each DVO catalog, updating the measures that come from the modified images
+// We need to watch for failures:
+// * in UpdateMeasures, in fixImageRaw, we track the cumulative offset for each image
+// * after all updates are done, we can check for any bad images and reset them to the
+//   original coordinates
 
 int UpdateObjectOffsets (SkyList *skylist) {

branches/eam_branches/relastro.20100326/src/fitpoly.c

@@ -103 +103 @@
 
 /* convert the xsum,ysum,sum terms into vector,matrix and solve */
-void fit_eval (CoordFit *fit) {
+int fit_eval (CoordFit *fit) {
 
   int i, j, ix, iy, jx, jy;
@@ -147 +147 @@
   }     
 
-  dgaussjordan (matrix, vector, fit[0].Nelems, 2); 
+  status = dgaussjordan (matrix, vector, fit[0].Nelems, 2); 
+  if (!status) {
+    return (FALSE);
+  }
 
   for (i = 0; i < fit[0].Nelems; i++) {
@@ -166 +169 @@
   array_free (matrix, fit[0].Nelems);
   array_free (vector, fit[0].Nelems);
+  return (TRUE);
 }
 
@@ -271 +275 @@
 /* this should only apply to the polynomial, not the projection terms */
 /* compare with psastro supporting code */
-CoordFit *fit_apply_coords (CoordFit *fit, Coords *coords) {
+int fit_apply_coords (CoordFit *fit, Coords *coords) {
 
   double Xo, Yo, R1, R2;
@@ -281 +285 @@
   // L = pc1_1*cd1*(x - cp1) + pc1_2*cd2*(y - cp2) + ...
 
-  CoordsGetCenter (fit, 0.001, &Xo, &Yo);
+  if (!CoordsGetCenter (fit, 0.001, &Xo, &Yo)) {
+    fprintf (stderr, "failed to modify model\n");
+    return (FALSE);
+  }
   coords[0].crpix1 = Xo;
   coords[0].crpix2 = Yo;
@@ -329 +336 @@
   /* keep the order and type from initial values */
   
-  // XXX if desired in the future, return modfit (and free above)
-  return (NULL);
-}
-
+  return (TRUE);
+}
+

branches/eam_branches/relastro.20100326/src/mkpolyterm.c

@@ -73 +73 @@
     if (dPos > dPosRef) {
       fprintf (stderr, "*** warning : non-convergence in model conversion (mkpolyterm.c;73) *** \n");
+      return FALSE;
     }
     array_free (alpha, 2);

branches/eam_branches/relastro.20100326/src/relastro.c

@@ -39 +39 @@
   skylist = load_images (&db, &UserPatch);
   MARKTIME("load images: %f sec\n", dtime);
+
+  initCoords();
 
   /* load catalog data from region files : subselect high-quality measurements */
@@ -83 +85 @@
   UpdateObjectOffsets (skylist);
 
+  // iterate over catalogs to make detection coordinates consistant
+  FixProblemImages ();
+
   // save the updated image parameters
   dvo_image_update (&db, VERBOSE);