Changeset 28955 for trunk/Ohana/src/opihi/dvo/photometry.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/photometry.c (modified) (2 diffs)

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

@@ -1178 +1178 @@
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      image = MatchImage (measure[0].t, measure[0].photcode);
+      image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
       if (image == NULL) break;
       RD_to_XY (&x, &y, ra, dec, &image[0].coords);
@@ -1191 +1191 @@
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      image = MatchImage (measure[0].t, measure[0].photcode);
+      image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
       if (image == NULL) break;
       RD_to_XY (&x, &y, ra, dec, &image[0].coords);