Changeset 37822 for branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/libdvo/include/dvodb.h

Timestamp:

Jan 12, 2015, 12:29:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/include/dvodb.h (modified) (7 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/libdvo/include/dvodb.h

@@ -54 +54 @@
   MAG_OPTION_NPHOT, // Nused
   MAG_OPTION_UC_DIST, 
-  MAG_OPTION_STACK_DET_ID, 
   MAG_OPTION_FLAGS, 
+
+  MAG_OPTION_X11_SM_OBJ, 
+  MAG_OPTION_X12_SM_OBJ, 
+  MAG_OPTION_X22_SM_OBJ, 
+  MAG_OPTION_E1_SM_OBJ, 
+  MAG_OPTION_E2_SM_OBJ, 
+
+  MAG_OPTION_X11_SH_OBJ, 
+  MAG_OPTION_X12_SH_OBJ, 
+  MAG_OPTION_X22_SH_OBJ, 
+  MAG_OPTION_E1_SH_OBJ, 
+  MAG_OPTION_E2_SH_OBJ, 
+
+  MAG_OPTION_X11_SM_PSF, 
+  MAG_OPTION_X12_SM_PSF, 
+  MAG_OPTION_X22_SM_PSF, 
+  MAG_OPTION_E1_SM_PSF, 
+  MAG_OPTION_E2_SM_PSF, 
+
+  MAG_OPTION_X11_SH_PSF, 
+  MAG_OPTION_X12_SH_PSF, 
+  MAG_OPTION_X22_SH_PSF, 
+  MAG_OPTION_E1_SH_PSF, 
+  MAG_OPTION_E2_SH_PSF, 
+
+  MAG_OPTION_F_AP_R5, 
+  MAG_OPTION_F_ERR_AP_R5, 
+  MAG_OPTION_F_STDEV_AP_R5, 
+  MAG_OPTION_F_FILL_AP_R5, 
+
+  MAG_OPTION_F_AP_R6, 
+  MAG_OPTION_F_ERR_AP_R6, 
+  MAG_OPTION_F_STDEV_AP_R6, 
+  MAG_OPTION_F_FILL_AP_R6, 
 } dvoMagOptionType;
+
+//  MAG_OPTION_STACK_PRIMARY_OFF, 
+//  MAG_OPTION_STACK_BEST_OFF, 
 
 typedef enum {
@@ -137 +173 @@
       MEAS_XFIX, 
       MEAS_YFIX, 
+      MEAS_XOFF_KH, 
+      MEAS_YOFF_KH, 
+      MEAS_XOFF_DCR, 
+      MEAS_YOFF_DCR, 
+      MEAS_ROFF_GAL, 
+      MEAS_DOFF_GAL, 
       MEAS_POS_SYS_ERR, 
       MEAS_XFIELD, 
@@ -160 +202 @@
       MEAS_FLAT,
       MEAS_CENTER_OFFSET,
-      MEAS_REF_COLOR,
+      MEAS_REF_COLOR_BLUE,
+      MEAS_REF_COLOR_RED,
+      MEAS_X11_SM_OBJ, 
+      MEAS_X12_SM_OBJ, 
+      MEAS_X22_SM_OBJ, 
+      MEAS_E1_SM_OBJ, 
+      MEAS_E2_SM_OBJ, 
+      MEAS_X11_SH_OBJ, 
+      MEAS_X12_SH_OBJ, 
+      MEAS_X22_SH_OBJ, 
+      MEAS_E1_SH_OBJ, 
+      MEAS_E2_SH_OBJ, 
+      MEAS_X11_SM_PSF, 
+      MEAS_X12_SM_PSF, 
+      MEAS_X22_SM_PSF, 
+      MEAS_E1_SM_PSF, 
+      MEAS_E2_SM_PSF, 
+      MEAS_X11_SH_PSF, 
+      MEAS_X12_SH_PSF, 
+      MEAS_X22_SH_PSF, 
+      MEAS_E1_SH_PSF, 
+      MEAS_E2_SH_PSF, 
+      MEAS_E_BV,                      // extinction (mags)
+      MEAS_E_BV_ERR,
+      MEAS_DISTANCE_MOD, // distance modulus (mags)
+      MEAS_DISTANCE_MOD_ERR,
+      MEAS_M_R,               // absolute mag in r-band
+      MEAS_M_R_ERR,
+      MEAS_FEH,               // metallicity
+      MEAS_FEH_ERR,
+      MEAS_URA_GALMODEL,      // model pm prediction
+      MEAS_UDEC_GALMODEL,     // model pm prediction
+      MEAS_RA_GALMODEL,      // model pm prediction
+      MEAS_DEC_GALMODEL,     // model pm prediction
 };
 
@@ -198 +273 @@
       AVE_EXTID_HI,
       AVE_EXTID_LO,
-      AVE_REF_COLOR,
+      AVE_REF_COLOR_BLUE,
+      AVE_REF_COLOR_RED,
       AVE_PHOT, // photometry class of values
+      AVE_E_BV,               // extinction (mags)
+      AVE_E_BV_ERR,
+      AVE_DISTANCE_MOD, // distance modulus (mags)
+      AVE_DISTANCE_MOD_ERR,
+      AVE_M_R,                // absolute mag in r-band
+      AVE_M_R_ERR,
+      AVE_FEH,                // metallicity
+      AVE_FEH_ERR,
+      AVE_URA_GALMODEL,      // model pm prediction
+      AVE_UDEC_GALMODEL,     // model pm prediction
+      AVE_RA_GALMODEL,      // model pm prediction
+      AVE_DEC_GALMODEL,     // model pm prediction
 };
 
@@ -274 +362 @@
       IMAGE_NLINK_PHOTOM,
       IMAGE_NLINK_ASTROM,
-      IMAGE_REF_COLOR
+      IMAGE_REF_COLOR_BLUE,
+      IMAGE_REF_COLOR_RED
 };
 
@@ -366 +455 @@
 int          ParseImageField        PROTO((dbField *field, char *fieldName));
 
-dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
-dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
+dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, dbField *field));
+dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensing *lensing, StarPar *starpar, dbField *field));
 dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
 
@@ -374 +463 @@
 int          dbAstroRegionLimits    PROTO((dbStack **stack, int *nstack, SkyRegionSelection *selection, int table));
 char        *strfloat               PROTO((float value));
+
+int dbFieldNeedMeasure (dbField *fields, int Nfields);
+int dbFieldNeedLensobj (dbField *fields, int Nfields);
+int dbFieldNeedLensing (dbField *fields, int Nfields);
+int dbFieldNeedStarpar (dbField *fields, int Nfields, int isAverage);
 
 void FreeImageSelection (void);