Changeset 16810 for trunk/Ohana/src/opihi/dvo/imextract.c

Timestamp:

Mar 4, 2008, 12:39:41 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080223 : updates to DVO output format, addstar (SDSS and 2MASS flags), relastro (FitChip)

File:

• trunk/Ohana/src/opihi/dvo/imextract.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "dvoshell.h"
 
-enum {ZERO, RA, DEC, Xm, AIRMASS, MCAL, dMCAL, PHOTCODE, TIME, FWHM, EXPTIME, NSTAR, SKY, NCAL, FLAG, NX_PIX, NY_PIX, THETA, SKEW, SCALE, DSCALE};
+// need to upgrade this to support multiple fields and WHERE clauses
+
+enum {ZERO, RA, DEC, Xm, AIRMASS, MCAL, dMCAL, PHOTCODE, TIME, FWHM, EXPTIME, NSTAR, SKY, NCAL, FLAG, NX_PIX, NY_PIX, THETA, SKEW, SCALE, DSCALE, IMAGE_ID};
 
 int imextract (int argc, char **argv) {
@@ -94 +96 @@
   if (!strcasecmp (argv[1], "scale")) mode = SCALE;
   if (!strcasecmp (argv[1], "dscale")) mode = DSCALE;
+  if (!strcasecmp (argv[1], "imageID")) mode = IMAGE_ID;
   if (mode == ZERO) {
     gprint (GP_ERR, "value may be one of the following:\n");
@@ -181 +184 @@
         vec[0].elements[N] = image[j].NY;
         break;
+      case IMAGE_ID:
+        vec[0].elements[N] = image[j].imageID;
+        break;
       case THETA: {
         double theta1, theta2, s1, s2;