Changeset 28989 for branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/dbExtractMeasures.c

Timestamp:

Aug 20, 2010, 11:04:39 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

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

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -358 +358 @@
         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);
@@ -374 +374 @@
         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);
@@ -440 +440 @@
       value.Flt = measure[0].extNsigma;
       break;
+    case MEAS_EXTERN_ID: /* OK */
+      {
+        Image *image;
+        image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
+        value.Int = image->externID;
+      }
+      break;
 
       // add the star/galaxy sep --