Changeset 28955 for trunk/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Aug 18, 2010, 2:54:33 PM (16 years ago)

Author:

bills

Message:

add image->externID to the list of allowed fields for mextract.
Pass measure->imageID to the function MatchImage and if valid, use it to find the image directly

File:

• trunk/Ohana/src/opihi/dvo/mextract.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -88 +88 @@
   mosaicMode = FALSE;
   for (i = 0; !loadImages && (i < Nfields); i++) {
-    if (fields[i].ID == MEAS_XCCD) loadImages = TRUE;
-    if (fields[i].ID == MEAS_YCCD) loadImages = TRUE;
+    if (fields[i].ID == MEAS_XCCD) loadImages = TRUE;   // Are these still needed? Xccd and Yccd are in measurement
+    if (fields[i].ID == MEAS_YCCD) loadImages = TRUE;   // and dbExtractMeasures doesn't look at the image for these
     if (fields[i].ID == MEAS_XMOSAIC) loadImages = mosaicMode = TRUE;
     if (fields[i].ID == MEAS_YMOSAIC) loadImages = mosaicMode = TRUE;
+    if (fields[i].ID == MEAS_EXTERN_ID) loadImages = mosaicMode = TRUE;
   }
   if (loadImages && !SetImageSelection (mosaicMode, selection)) goto escape;
@@ -305 +306 @@
     gprint (GP_ERR, "  catID : catalog ID (32 bit)\n");
     gprint (GP_ERR, "  imageID : ID of source image (32 bit)\n");
+    gprint (GP_ERR, "  externID : externID of source image (32 bit)\n");
     return (FALSE);
   }