Changeset 27490

Timestamp:

Mar 27, 2010, 3:05:38 PM (16 years ago)

Author:

eugene

Message:

improve the failed fit analysis

Location:

branches/eam_branches/relastro.20100326/src

Files:

• FitChip.c (modified) (1 diff)
• FixProblemImages.c (modified) (3 diffs)
• ImageOps.c (modified) (1 diff)
• UpdateChips.c (modified) (1 diff)

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

@@ -93 +93 @@
     }
 
-    fprintf (stderr, "scatter limit: %f based on %d detections; using %d of %d for fit\n", dRmax, Nscatter, fit[0].Npts, Nmatch);
+    // fprintf (stderr, "scatter limit: %f based on %d detections; using %d of %d for fit\n", dRmax, Nscatter, fit[0].Npts, Nmatch);
 
     // measure the fit, update the coords & object coordinates

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

@@ -6 +6 @@
 int FixProblemImages (SkyList *skylist) {
 
+  int Nbad;
   off_t i, Nimage;
   Image *image;
@@ -16 +17 @@
   image = getimages (&Nimage);
 
+  Nbad = 0;
   // first check on the dPos reported for each image
   for (i = 0; i < Nimage; i++) {
     double dPosSum, dPos;
     off_t nPos;
+
+    // check if this image should be fixed
+    if (badCoords(i)) {
+      Nbad ++;
+      continue;
+    }
+
     getOffsets (&dPosSum, &nPos, i);
     dPos = sqrt(dPosSum / nPos);
     if (dPos > 4.0) {
       setBadCoords (i);
+      Nbad ++;
     }
   }
+
+  fprintf (stderr, "fixing %d images\n", Nbad);
 
   for (i = 0; i < Nimage; i++) {
@@ -33 +45 @@
     // check if this image should be fixed
     if (!badCoords(i)) continue;
+
+    fprintf (stderr, "fixing %s\n", image[i].name);
 
     // I need a list of the catalogs for this image

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

@@ -369 +369 @@
     dD = 3600.0*(catalog[c].average[n].D - D);
 
+    // complain if the new location is far from the average location
+    if (fabs(dR) > 2.0) {
+      fprintf (stderr, "!");
+      setBadCoords (im); // report a failure for this image
+      return;
+    }
+    if (fabs(dD) > 2.0) {
+      fprintf (stderr, "*");
+      setBadCoords (im); // report a failure for this image
+      return;
+    }
+
+    // complain if the new location is far from the old location
     if (fabs(catalog[c].measure[m].dR - dR) > 2.0) {
       fprintf (stderr, "!");

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

@@ -28 +28 @@
 
     // FitChip does iterative, clipped fitting
-    fprintf (stderr, "image %lld : Nstars: %lld\n", (long long) i, (long long) Nraw);
+    // fprintf (stderr, "image %lld : Nstars: %lld\n", (long long) i, (long long) Nraw);
     if (!FitChip (raw, ref, Nraw, &image[i].coords)) {
+      fprintf (stderr, "reject fit for image %s (%lld) : Nstars: %lld\n", image[i].name, (long long) i, (long long) Nraw);
       oldCoords = getCoords (i);
       memcpy (&image[i].coords, oldCoords, sizeof(Coords));