Changeset 27497 for branches/eam_branches/relastro.20100326/src/ImageOps.c

Timestamp:

Mar 28, 2010, 4:17:23 PM (16 years ago)

Author:

eugene

Message:

handle unmatched detections and images; add iteration over chips and objects

File:

• branches/eam_branches/relastro.20100326/src/ImageOps.c (modified) (7 diffs)

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

@@ -333 +333 @@
   if (badCoords(im)) return;
 
+  // WRP images need to have an associated mosaic
   moscoords = NULL;
-  mosaic = getMosaicForImage (im);
-  if (mosaic != NULL) {
+  if (!strcmp(&image[im].coords.ctype[4], "-WRP")) {
+    mosaic = getMosaicForImage (im);
+    if (mosaic == NULL) return;  // if we cannot find the associated image, skip it
     moscoords = &mosaic[0].coords;
   }
@@ -383 +385 @@
     // complain if the new location is far from the old location
     if (fabs(catalog[c].measure[m].dR - dR) > 2.0) {
-      fprintf (stderr, "!");
+      fprintf (stderr, "@");
       setBadCoords (im); // report a failure for this image
       return;
     }
     if (fabs(catalog[c].measure[m].dD - dD) > 2.0) {
-      fprintf (stderr, "*");
+      fprintf (stderr, "#");
       setBadCoords (im); // report a failure for this image
       return;
@@ -436 +438 @@
   memcpy (&image[im].coords, oldcoords, sizeof(Coords));
 
+  // WRP images need to have an associated mosaic
   moscoords = NULL;
-  mosaic = getMosaicForImage (im);
-  if (mosaic != NULL) {
+  if (!strcmp(&image[im].coords.ctype[4], "-WRP")) {
+    mosaic = getMosaicForImage (im);
+    if (mosaic == NULL) return;  // if we cannot find the associated image, skip it
     moscoords = &mosaic[0].coords;
   }
@@ -492 +496 @@
   StarData *raw;
 
-  ALLOCATE (raw, StarData, Nlist[im]);
-
   mosaic = NULL;
   moscoords = NULL;
@@ -500 +502 @@
     if (mosaic == NULL) {
       fprintf (stderr, "mosaic not found for image %s\n", image[im].name);
-      abort();
+      return NULL;
     }
     moscoords = &mosaic[0].coords;
   }
+
+  ALLOCATE (raw, StarData, Nlist[im]);
 
   for (i = 0; i < Nlist[im]; i++) {
@@ -567 +571 @@
   StarData *ref;
 
-  ALLOCATE (ref, StarData, Nlist[im]);
-
   mosaic = NULL;
   moscoords = NULL;
@@ -575 +577 @@
     if (mosaic == NULL) {
       fprintf (stderr, "mosaic not found for image %s\n", image[im].name);
-      abort ();
+      return NULL;
     }
     moscoords = &mosaic[0].coords;
   }
+
+  ALLOCATE (ref, StarData, Nlist[im]);
 
   for (i = 0; i < Nlist[im]; i++) {