Changeset 37563 for branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/dvodb.h

Timestamp:

Nov 6, 2014, 8:18:01 PM (12 years ago)

Author:

eugene

Message:

adding starpar parameters for measures

File:

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

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

@@ -217 +217 @@
       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
 };
 
@@ -266 +278 @@
       AVE_URA_GALMODEL,      // model pm prediction
       AVE_UDEC_GALMODEL,     // model pm prediction
+      AVE_RA_GALMODEL,      // model pm prediction
+      AVE_DEC_GALMODEL,     // model pm prediction
 };
 
@@ -433 +447 @@
 
 dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, dbField *field));
-dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, 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));
 
@@ -443 +457 @@
 int dbFieldNeedMeasure (dbField *fields, int Nfields);
 int dbFieldNeedLensobj (dbField *fields, int Nfields);
-int dbFieldNeedStarpar (dbField *fields, int Nfields);
+int dbFieldNeedLensing (dbField *fields, int Nfields);
+int dbFieldNeedStarpar (dbField *fields, int Nfields, int isAverage);
 
 void FreeImageSelection (void);