Changeset 37378 for branches/eam_branches/ipp-20140904/Ohana/src/getstar/src/MatchImages.c

Timestamp:

Sep 8, 2014, 2:44:35 PM (12 years ago)

Author:

eugene

Message:

i am making image.coords.mosaic and image.parent pointers to the parent (PHU) coord and image strutures; BuildChipMatch sets these values and we do not need to call FindMosaicForImage

File:

• branches/eam_branches/ipp-20140904/Ohana/src/getstar/src/MatchImages.c (modified) (2 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/getstar/src/MatchImages.c

@@ -24 +24 @@
   /* for mosaic astrometry, the grid should be w.r.t. the tangent-plane, not chip coords */
   if (!strcmp (&image[0].coords.ctype[4], "-WRP")) {
-    // if the input image is a mosaic, we need to register that mosaic for the calculations below
-    if (MOSAIC == NULL) {
-      fprintf (stderr, "no mosaic for WRP image (use -mosaic)\n");
-      return NULL;
-    }
-    RegisterMosaic (MOSAIC);
-
-    tcoords = MOSAIC[0];
+    myAssert (image[0].coords.mosaic, "should already have tested this");
+    tcoords = image[0].coords.mosaic[0];
     tcoords.cdelt1 = tcoords.cdelt2 = 1.0 / 3600.0;
     tcoords.pc1_1 = tcoords.pc2_2 = 1.0;
@@ -77 +71 @@
     if (!WITH_PHU && !strcmp (&dbImages[i].coords.ctype[4], "-DIS")) continue;
     if ( SOLO_PHU &&  strcmp (&dbImages[i].coords.ctype[4], "-DIS")) continue;
-
-    /* if any of these images are WRP images, need to find matching DIS */
-    if (!FindMosaicForImage (dbImages, NdbImages, i)) continue;
 
     /* define image corners */