Changeset 35244 for branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mmatch.c

Timestamp:

Mar 6, 2013, 11:32:20 AM (13 years ago)

Author:

eugene

Message:

partial improvement in getting image data for mextract

File:

• branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mmatch.c (modified) (3 diffs)

branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mmatch.c

@@ -1 +1 @@
 # include "dvoshell.h"
+int field_needs_images (dbField *field);
 
 /* This function uses the 'find_match' algorithm to select the objects of interest.
@@ -164 +165 @@
   // load image data if needed (for fields listed below)
   int loadImages = FALSE;
-  int mosaicMode = FALSE;
   for (i = 0; !loadImages && (i < Nfields); i++) {
-    if (!MEASURE_HAS_XCCD) {
-      // I'm keeping this code because it gives a way of handling dvo dbs that don't have
-      // measure.xccd if we need it
-      if (fields[i].ID == MEAS_XCCD) loadImages = TRUE;
-      if (fields[i].ID == MEAS_YCCD) loadImages = TRUE;
-    }
-    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 (fields[i].ID == MEAS_FLAT)          loadImages = mosaicMode = TRUE;
-    if (fields[i].ID == MEAS_CENTER_OFFSET) loadImages = mosaicMode = TRUE;
+    loadImages = field_needs_images (&fields[i]);
   }
 
@@ -183 +173 @@
   selection.useDisplay = FALSE;
   selection.useSkyregion = FALSE;
-  if (loadImages && !SetImageSelection (mosaicMode, &selection)) goto escape;
+  if (loadImages && !SetImageSelection (TRUE, &selection)) goto escape;
 
   /* load regions which contain all supplied RA,DEC coordinates */