Changeset 38983 for branches/eam_branches/ipp-20150625/Ohana/src/libdvo/include/dvodb.h

Timestamp:

Oct 27, 2015, 4:19:52 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk (mostly updates to dvopsps and loadgalphot)

Location:

branches/eam_branches/ipp-20150625/Ohana

Files:

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

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

@@ -97 +97 @@
   MAG_OPTION_E1, 
   MAG_OPTION_E2, 
+
+  MAG_OPTION_GAL_MAG,
+  MAG_OPTION_GAL_MAG_ERR,
+  MAG_OPTION_GAL_MAJ,
+  MAG_OPTION_GAL_MAJ_ERR,
+  MAG_OPTION_GAL_MIN,
+  MAG_OPTION_GAL_MIN_ERR,
+  MAG_OPTION_GAL_THETA,
+  MAG_OPTION_GAL_THETA_ERR,
+  MAG_OPTION_GAL_INDEX,
+  MAG_OPTION_GAL_CHISQ,
+  MAG_OPTION_GAL_NPIX,
+  MAG_OPTION_GAL_TYPE,        
 } dvoMagOptionType;
 
@@ -107 +120 @@
   MAG_CLASS_KRON,
   MAG_CLASS_APER,
+  MAG_CLASS_DEV, // DeVaucouleur Model (only for galphot)
+  MAG_CLASS_EXP, // Exponential Model (only for galphot)
+  MAG_CLASS_SER, // Sersic Model (only for galphot)
 } dvoMagClassType;
 
@@ -484 +500 @@
 int          ParseImageField        PROTO((dbField *field, char *fieldName));
 
-dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, dbField *field));
+dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, GalPhot *galphot, 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));
@@ -497 +513 @@
 int dbFieldNeedLensing (dbField *fields, int Nfields);
 int dbFieldNeedStarpar (dbField *fields, int Nfields, int isAverage);
+int dbFieldNeedGalphot (dbField *fields, int Nfields);
 
 void FreeImageSelection (void);