Changeset 36908 for branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvodb.h

Timestamp:

Jun 18, 2014, 9:44:36 PM (12 years ago)

Author:

eugene

Message:

major rework for mag-related selections (allow mag:psf:inst:stk, etc)

File:

• branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvodb.h (modified) (6 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvodb.h

@@ -22 +22 @@
 
 /* magnitude types */
-enum {MAG_NONE, 
+
+typedef enum {
+  MAG_SRC_NONE,
+  MAG_SRC_CHP,
+  MAG_SRC_WRP,
+  MAG_SRC_STK,
+} dvoMagSourceType;
+
+typedef enum {
+  MAG_LEVEL_NONE,       // -2.5*log(DN) [ie, not DN/sec]
+  MAG_LEVEL_INST,               // -2.5*log(DN) [ie, not DN/sec]
+  MAG_LEVEL_CAT,                // MAG_INST + 2.5*log(exptime) + C_lambda + K_lambda*(airmass - 1)
+  MAG_LEVEL_SYS, // MAG_CAT + \sum_i A_i * (color_i - color_o) [color correction for measure photcode]
+  MAG_LEVEL_REL, // MAG_SYS - Mcal [specific zero point for image]
+  MAG_LEVEL_CAL, // MAG_REL + \sum_i A_i * (color_i - color_o) [color correction for average photcode]
+  MAG_LEVEL_AVE, 
+  MAG_LEVEL_REF, 
+} dvoMagLevelType;
+
+typedef enum {
+  MAG_OPTION_NONE,
+  MAG_OPTION_MAG,
+  MAG_OPTION_FLUX,
+  MAG_OPTION_FLUX_ERR,
+  MAG_OPTION_ERR,
+  MAG_OPTION_STDEV,
+  MAG_OPTION_CHISQ,
+  MAG_OPTION_MIN,
+  MAG_OPTION_MAX,
+  MAG_OPTION_NCODE,
+  MAG_OPTION_NPHOT, // Nused
+  MAG_OPTION_UC_DIST, 
+  MAG_OPTION_STACK_DET_ID, 
+  MAG_OPTION_FLAGS, 
+} dvoMagOptionType;
+
+typedef enum {
+  MAG_CLASS_NONE,
+  MAG_CLASS_PSF,
+  MAG_CLASS_KRON,
+  MAG_CLASS_APER,
+} dvoMagClassType;
+
+# if (0)
+enum {
+  MAG_NONE, 
 
       // these magnitude types are from the measurement table (or derived therein)
@@ -53 +98 @@
       // these magnitude types are from the average (secfilt) table:
       // the following imply PSF magnitudes (or fluxes)
-      MAG_AVE, 
-      MAG_REF, 
       MAG_STDEV, 
       MAG_AVE_ERR, 
@@ -79 +122 @@
       MAG_UC_DIST, 
       MAG_STACK_DET_ID, 
-};
+} ;
+# endif
 
 /* measure fields */
@@ -173 +217 @@
       MEAS_EXTERN_ID,
       MEAS_EXPNAME_AS_INT,
-      MEAS_MCAL_OFFSET,
+      MEAS_MCAL_OFFSET, // make this a dvoMagOption?
       MEAS_FLAT,
       MEAS_CENTER_OFFSET,
-      MEAS_FLUX_PSF,
-      MEAS_FLUX_PSF_ERR,
-      MEAS_FLUX_KRON,
-      MEAS_FLUX_KRON_ERR,
       MEAS_REF_COLOR,
 };
@@ -312 +352 @@
   int table;
   int ID;
-  int magMode;
+
+  dvoMagSourceType magSource; // chip, (forced) warp, stack [only relevant for averages]
+  dvoMagLevelType magLevel;  // inst, cat, sys, rel, ave, ref, err, min, max, stdev, nphot, chisq, 
+  dvoMagOptionType magOption;  // psf, kron, aper
+  dvoMagClassType magClass;
+
   char type;
   PhotCode *photcode;
@@ -374 +419 @@
 
 int          GetMagMode             PROTO((char *string));
-PhotCode    *ParsePhotcodeField     PROTO((char *field, int *mode, int def));
+int          ParsePhotcodeField     PROTO((dbField *field, char *fieldName));
 int          ParseMeasureField      PROTO((dbField *field, char *fieldName));
 int          ParseAverageField      PROTO((dbField *field, char *fieldName));