Changeset 30612 for trunk/Ohana/src/opihi/dvo/dbExtractImages.c

Timestamp:

Feb 13, 2011, 11:23:17 AM (15 years ago)

Author:

eugene

Message:

trap error in where for imextract, avextract; add new fields for calibration quality (dXpixSys, etc); use new utility functions ala ToShortPixels; fix plotting of skycat at boundary

File:

• trunk/Ohana/src/opihi/dvo/dbExtractImages.c (modified) (2 diffs)

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

@@ -241 +241 @@
 
     case IMAGE_NCAL:
-      value.Int = image[N].Mxxxx;
+      value.Int = image[N].nFitPhotom;
       break;
     case IMAGE_SKY:
-      value.Flt = image[N].Myyyy + 0x8000;
+      value.Flt = NAN;
       break;
     case IMAGE_FLAGS:
@@ -299 +299 @@
       value.Flt = (field->ID == IMAGE_X_UR_FP) ? x : y;
       break;
+
+    case IMAGE_X_ERR_SYS:
+      value.Flt = image[N].dXpixSys;
+      break;
+    case IMAGE_Y_ERR_SYS:
+      value.Flt = image[N].dXpixSys;
+      break;
+    case IMAGE_MAG_ERR_SYS:
+      value.Flt = image[N].dMagSys;
+      break;
+
+    case IMAGE_NFIT_PHOTOM:
+      value.Int = image[N].nFitPhotom;
+      break;
+    case IMAGE_NFIT_ASTROM:
+      value.Int = image[N].nFitAstrom;
+      break;
+    case IMAGE_NLINK_PHOTOM:
+      value.Int = image[N].nLinkPhotom;
+      break;
+    case IMAGE_NLINK_ASTROM:
+      value.Int = image[N].nLinkAstrom;
+      break;
   }
   return (value);