Changeset 20873 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/imextract.c

Timestamp:

Dec 2, 2008, 6:24:28 PM (18 years ago)

Author:

eugene

Message:

fixes for interger-type vectors; finish imextract upgrade

File:

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

branches/eam_branch_20081124/Ohana/src/opihi/dvo/imextract.c

@@ -39 +39 @@
   if ((selection = SetRegionSelection (&argc, argv)) == NULL) {
     gprint (GP_ERR, "invalid sky region selection\n");
-    return FALSE;
+    goto escape;
   }
 
@@ -46 +46 @@
   // parse the fields to be extracted and returned
   fields = dbCmdlineFields (argc, argv, DVO_TABLE_IMAGE, &last, &Nfields);
-  if (fields == NULL) return (FALSE);
+  if (fields == NULL) goto escape;
+  if (Nfields == 0) {
+    FreeSkyRegionSelection (selection);
+    dbFreeFields (fields, Nfields);
+    goto help;
+  }
 
   // examine line for 'where' or 'match to'.  'match to' is forbidden
@@ -158 +163 @@
     gprint (GP_ERR, "  RA : right ascension of field center (J2000)\n");
     gprint (GP_ERR, "  DEC : declination of field center\n");
+    gprint (GP_ERR, "  Xm : chisq of photometry calibration\n");
+    gprint (GP_ERR, "  airmass : mean airmass of exposure\n");
+    gprint (GP_ERR, "  Mcal : photometry calibration (mags)\n");
+    gprint (GP_ERR, "  dMcal : photometry calibration error (mags)\n");
+    gprint (GP_ERR, "  photcode : numeric photcode value for image\n");
+    gprint (GP_ERR, "  time : time of exposure\n");
+    gprint (GP_ERR, "  FWHM : mean fwhm of exposure\n");
+    gprint (GP_ERR, "  exptime : exposure duration (seconds)\n");
+    gprint (GP_ERR, "  nstar : number of stars detected in exposure\n");
+    gprint (GP_ERR, "  ncal : number of stars used for photometry calibration\n");
+    gprint (GP_ERR, "  sky : mean background flux\n");
+    gprint (GP_ERR, "  flag : processing bit flags\n");
+    gprint (GP_ERR, "  NX : image dimensions\n");
+    gprint (GP_ERR, "  NY : image dimensions\n");
+    gprint (GP_ERR, "  theta : position angle of image\n");
+    gprint (GP_ERR, "  skew : distortion from rectangle\n");
+    gprint (GP_ERR, "  scale : pixel scale\n");
+    gprint (GP_ERR, "  dscale : pixel-scale error (or variation?)\n");
+    gprint (GP_ERR, "  imageID : unique image identifier\n");
+    gprint (GP_ERR, "  X_LL_CHIP : chip x-pixel coordinate of lower left corner\n");
+    gprint (GP_ERR, "  X_LR_CHIP : chip x-pixel coordinate of lower right corner\n");
+    gprint (GP_ERR, "  X_UL_CHIP : chip x-pixel coordinate of upper left corner\n");
+    gprint (GP_ERR, "  X_UR_CHIP : chip x-pixel coordinate of upper right corner\n");
+    gprint (GP_ERR, "  Y_LL_CHIP : chip y-pixel coordinate of lower left corner\n");
+    gprint (GP_ERR, "  Y_LR_CHIP : chip y-pixel coordinate of lower right corner\n");
+    gprint (GP_ERR, "  Y_UL_CHIP : chip y-pixel coordinate of upper left corner\n");
+    gprint (GP_ERR, "  Y_UR_CHIP : chip y-pixel coordinate of upper right corner\n");
+    gprint (GP_ERR, "  X_LL_FP   : focal-plane x-pixel coordinate of lower left corner\n");
+    gprint (GP_ERR, "  X_LR_FP   : focal-plane x-pixel coordinate of lower right corner\n");
+    gprint (GP_ERR, "  X_UL_FP   : focal-plane x-pixel coordinate of upper left corner\n");
+    gprint (GP_ERR, "  X_UR_FP   : focal-plane x-pixel coordinate of upper right corner\n");
+    gprint (GP_ERR, "  Y_LL_FP   : focal-plane y-pixel coordinate of lower left corner\n");
+    gprint (GP_ERR, "  Y_LR_FP   : focal-plane y-pixel coordinate of lower right corner\n");
+    gprint (GP_ERR, "  Y_UL_FP   : focal-plane y-pixel coordinate of upper left corner\n");
+    gprint (GP_ERR, "  Y_UR_FP   : focal-plane y-pixel coordinate of upper right corner\n");
     return (FALSE);
   }