Changeset 38601 for trunk/Ohana/src/libdvo/src/dbFields.c

Timestamp:

Jul 18, 2015, 12:40:32 PM (11 years ago)

Author:

eugene

Message:

adding galphot fields to avextract; Ohana builds, but avextract does not yet return the galphot values

File:

• trunk/Ohana/src/libdvo/src/dbFields.c (modified) (1 diff)

trunk/Ohana/src/libdvo/src/dbFields.c

@@ -161 +161 @@
 }
 
-int dbFieldNeedStarpar (dbField *fields, int Nfields, int isAverage) {
+int dbFieldNeedGalphot (dbField *fields, int Nfields) {
   int i;
   for (i = 0; i < Nfields; i++) {
-    if (isAverage) {
-      if (fields[i].ID == AVE_E_BV)             return TRUE;
-      if (fields[i].ID == AVE_E_BV_ERR)         return TRUE;
-      if (fields[i].ID == AVE_DISTANCE_MOD)     return TRUE;
-      if (fields[i].ID == AVE_DISTANCE_MOD_ERR) return TRUE;
-      if (fields[i].ID == AVE_M_R)              return TRUE;
-      if (fields[i].ID == AVE_M_R_ERR)          return TRUE;
-      if (fields[i].ID == AVE_FEH)              return TRUE;
-      if (fields[i].ID == AVE_FEH_ERR)          return TRUE;
-      if (fields[i].ID == AVE_URA_GALMODEL)     return TRUE;
-      if (fields[i].ID == AVE_UDEC_GALMODEL)    return TRUE;
-      if (fields[i].ID == AVE_RA_GALMODEL)      return TRUE;
-      if (fields[i].ID == AVE_DEC_GALMODEL)     return TRUE;
-    }
-  }
+    if (fields[i].ID == AVE_GAL_MAG         ) return TRUE;
+    if (fields[i].ID == AVE_GAL_MAG_ERR     ) return TRUE;
+    if (fields[i].ID == AVE_GAL_MAJ         ) return TRUE;
+    if (fields[i].ID == AVE_GAL_MAJ_ERR     ) return TRUE;
+    if (fields[i].ID == AVE_GAL_MIN         ) return TRUE;
+    if (fields[i].ID == AVE_GAL_MIN_ERR     ) return TRUE;
+    if (fields[i].ID == AVE_GAL_THETA       ) return TRUE;
+    if (fields[i].ID == AVE_GAL_THETA_ERR   ) return TRUE;
+    if (fields[i].ID == AVE_GAL_INDEX       ) return TRUE;
+    if (fields[i].ID == AVE_GAL_CHISQ       ) return TRUE;
+    if (fields[i].ID == AVE_GAL_NPIX        ) return TRUE;
+    if (fields[i].ID == AVE_GAL_TYPE        ) return TRUE;
+  }
+  return FALSE;
 }