Changeset 20908 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/dbExtractImages.c

Timestamp:

Dec 4, 2008, 6:07:54 PM (18 years ago)

Author:

eugene

Message:

adding additional image fields to imextract

File:

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

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

@@ -141 +141 @@
       value.Flt = ELAT;
       break;
-    case IMAGE_XM:
-      value.Flt = pow(10.0, 0.01*image[N].Xm);
-      break;
-    case IMAGE_AIRMASS:
-      value.Flt = image[N].secz;
-      break;
-    case IMAGE_MCAL:
-      value.Flt = image[N].Mcal;
-      break;
-    case IMAGE_dMCAL:
-      value.Flt = image[N].dMcal;
-      break;
-    case IMAGE_PHOTCODE:
-      value.Int = image[N].photcode;
-      break;
-    case IMAGE_TIME:
-      t = image[N].tzero + 0.5*image[N].NY * image[N].trate / 10000;
-      value.Flt = TimeValue (t, TimeReference, TimeFormat);
-      break;
-    case IMAGE_FWHM:
-      value.Flt = image[N].fwhm_x / 25.0;
-      break;
-    case IMAGE_EXPTIME:
-      value.Flt = image[N].exptime;
-      break;
-    case IMAGE_NSTAR:
-      value.Int = image[N].nstar;
-      break;
-    case IMAGE_NCAL:
-      value.Int = image[N].Mxxxx;
-      break;
-    case IMAGE_SKY:
-      value.Flt = image[N].Myyyy + 0x8000;
-      break;
-    case IMAGE_FLAG:
-      value.Int = image[N].code;
-      break;
-    case IMAGE_NX_PIX:
-      value.Int = image[N].NX;
-      break;
-    case IMAGE_NY_PIX:
-      value.Int = image[N].NY;
-      break;
-    case IMAGE_IMAGE_ID:
-      value.Int = image[N].imageID;
-      break;
+
     case IMAGE_THETA: {
       double theta1, theta2, s1, s2;
@@ -216 +171 @@
       break; }
 
+    case IMAGE_TIME:
+      t = image[N].tzero + 0.5*image[N].NY * image[N].trate / 10000;
+      value.Flt = TimeValue (t, TimeReference, TimeFormat);
+      break;
+    case IMAGE_NSTAR:
+      value.Int = image[N].nstar;
+      break;
+    case IMAGE_AIRMASS:
+      value.Flt = image[N].secz;
+      break;
+    case IMAGE_NX_PIX:
+      value.Int = image[N].NX;
+      break;
+    case IMAGE_NY_PIX:
+      value.Int = image[N].NY;
+      break;
+    case IMAGE_APRESID:
+      value.Flt = image[N].apmifit;
+      break;
+    case IMAGE_DAPRESID:
+      value.Flt = image[N].dapmifit;
+      break;
+
+    case IMAGE_MCAL:
+      value.Flt = image[N].Mcal;
+      break;
+    case IMAGE_dMCAL:
+      value.Flt = image[N].dMcal;
+      break;
+    case IMAGE_XM:
+      value.Flt = pow(10.0, 0.01*image[N].Xm);
+      break;
+    case IMAGE_PHOTCODE:
+      value.Int = image[N].photcode;
+      break;
+    case IMAGE_EXPTIME:
+      value.Flt = image[N].exptime;
+      break;
+    case IMAGE_SIDTIME:
+      value.Flt = image[N].sidtime;
+      break;
+
+    case IMAGE_LATITUDE:
+      value.Flt = image[N].latitude;
+      break;
+
+    case IMAGE_DET_LIMIT:
+      value.Flt = image[N].detection_limit * 0.1;
+      break;
+    case IMAGE_SAT_LIMIT:
+      value.Flt = image[N].saturation_limit * 0.1;
+      break;
+    case IMAGE_CERROR:
+      value.Flt = image[N].cerror / 50.0;
+      break;
+
+    case IMAGE_FWHM:
+      value.Flt = (image[N].fwhm_x + image[N].fwhm_y) / 50.0;
+      break;
+    case IMAGE_FWHM_MAJ:
+      value.Flt = image[N].fwhm_x / 25.0;
+      break;
+    case IMAGE_FWHM_MIN:
+      value.Flt = image[N].fwhm_y / 25.0;
+      break;
+    case IMAGE_TRATE:
+      value.Flt = image[N].trate / 10000.0;
+      break;
+
+    case IMAGE_NCAL:
+      value.Int = image[N].Mxxxx;
+      break;
+    case IMAGE_SKY:
+      value.Flt = image[N].Myyyy + 0x8000;
+      break;
+    case IMAGE_FLAG:
+      value.Int = image[N].code;
+      break;
+    case IMAGE_CCDNUM:
+      value.Int = image[N].ccdnum;
+      break;
+
+    case IMAGE_IMAGE_ID:
+      value.Int = image[N].imageID;
+      break;
+    case IMAGE_EXTERN_ID:
+      value.Int = image[N].externID;
+      break;
+    case IMAGE_SOURCE_ID:
+      value.Int = image[N].sourceID;
+      break;
+
       // reference pixel extractions
     case IMAGE_X_LL_CHIP: