Changeset 40245 for branches/eam_branches/ohana.20170822/src/libdvo

Timestamp:

Dec 5, 2017, 6:24:37 AM (9 years ago)

Author:

eugene

Message:

use McalAPER for stack aperture-like measurements, McalPSF for chip and warp

Location:

branches/eam_branches/ohana.20170822/src/libdvo

Files:

• include/dvodb.h (modified) (1 diff)
• src/dbExtractImages.c (modified) (1 diff)
• src/dbFields.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/libdvo/include/dvodb.h

@@ -377 +377 @@
       IMAGE_XM, 
       IMAGE_AIRMASS, 
-      IMAGE_MCAL, 
+      IMAGE_MCAL_PSF, 
+      IMAGE_MCAL_APER, 
       IMAGE_dMCAL, 
       IMAGE_PHOTCODE, 

branches/eam_branches/ohana.20170822/src/libdvo/src/dbExtractImages.c

@@ -219 +219 @@
       break;
 
-    case IMAGE_MCAL:
-      // XXX : note add McalAPER methods
+    case IMAGE_MCAL_PSF:
       value.Flt = image[N].McalPSF;
+      break;
+    case IMAGE_MCAL_APER:
+      value.Flt = image[N].McalAPER;
       break;
     case IMAGE_dMCAL:

branches/eam_branches/ohana.20170822/src/libdvo/src/dbFields.c

@@ -847 +847 @@
   if (!strcasecmp (fieldName, "dapresid" )) ESCAPE (IMAGE_DAPRESID,  OPIHI_FLT);
 
-  if (!strcasecmp (fieldName, "Mcal"     )) ESCAPE (IMAGE_MCAL,      OPIHI_FLT);
-  if (!strcasecmp (fieldName, "dMcal"    )) ESCAPE (IMAGE_dMCAL,     OPIHI_FLT);
-  if (!strcasecmp (fieldName, "Xm"       )) ESCAPE (IMAGE_XM,        OPIHI_FLT);
-  if (!strcasecmp (fieldName, "photcode" )) ESCAPE (IMAGE_PHOTCODE,  OPIHI_INT);
-  if (!strcasecmp (fieldName, "exptime"  )) ESCAPE (IMAGE_EXPTIME,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "Mcal"     )) ESCAPE (IMAGE_MCAL_PSF,     OPIHI_FLT);
+  if (!strcasecmp (fieldName, "McalPSF"  )) ESCAPE (IMAGE_MCAL_APER,    OPIHI_FLT);
+  if (!strcasecmp (fieldName, "McalAPER" )) ESCAPE (IMAGE_MCAL_APER,    OPIHI_FLT);
+  if (!strcasecmp (fieldName, "McalAPERTURE")) ESCAPE (IMAGE_MCAL_APER, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "dMcal"    )) ESCAPE (IMAGE_dMCAL,        OPIHI_FLT);
+  if (!strcasecmp (fieldName, "Xm"       )) ESCAPE (IMAGE_XM,           OPIHI_FLT);
+  if (!strcasecmp (fieldName, "photcode" )) ESCAPE (IMAGE_PHOTCODE,     OPIHI_INT);
+  if (!strcasecmp (fieldName, "exptime"  )) ESCAPE (IMAGE_EXPTIME,      OPIHI_FLT);
   if (!strcasecmp (fieldName, "expname"  )) ESCAPE (IMAGE_EXPNAME_AS_INT, OPIHI_INT);
   if (!strcasecmp (fieldName, "sidtime"  )) ESCAPE (IMAGE_SIDTIME,   OPIHI_FLT);