Changeset 38600 for trunk/Ohana/src/libdvo

Timestamp:

Jul 18, 2015, 8:21:16 AM (11 years ago)

Author:

eugene

Message:

fixing loadgalphot

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvodb.h (modified) (1 diff)
• src/dbFields.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/include/dvodb.h

@@ -304 +304 @@
       AVE_REF_COLOR_RED,
       AVE_PHOT, // photometry class of values
+      AVE_GAL_MAG,
+      AVE_GAL_MAG_ERR,
+      AVE_GAL_MAJ,
+      AVE_GAL_MAJ_ERR,
+      AVE_GAL_MIN,
+      AVE_GAL_MIN_ERR,
+      AVE_GAL_THETA,
+      AVE_GAL_THETA_ERR,
+      AVE_GAL_INDEX,
+      AVE_GAL_CHISQ,
+      AVE_GAL_NPIX,
+      AVE_GAL_TYPE,
       AVE_E_BV,               // extinction (mags)
       AVE_E_BV_ERR,

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

@@ -159 +159 @@
   }
   return FALSE;
+}
+
+int dbFieldNeedStarpar (dbField *fields, int Nfields, int isAverage) {
+  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;
+    }
+  }
 }
 
@@ -690 +710 @@
   if (!strcasecmp (fieldName, "REF_COLOR_RED"))  ESCAPE (AVE_REF_COLOR_RED,  OPIHI_FLT);
 
+  if (!strcasecmp (fieldName, "GAL_MAG"    ))      ESCAPE (AVE_GAL_MAG       ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_MAG_ERR"))      ESCAPE (AVE_GAL_MAG_ERR   ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_MAJ"    ))      ESCAPE (AVE_GAL_MAJ       ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_MAJ_ERR"))      ESCAPE (AVE_GAL_MAJ_ERR   ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_MIN"    ))      ESCAPE (AVE_GAL_MIN       ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_MIN_ERR"))      ESCAPE (AVE_GAL_MIN_ERR   ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_THETA"  ))      ESCAPE (AVE_GAL_THETA     ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_THETA_ERR"))    ESCAPE (AVE_GAL_THETA_ERR ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_INDEX"  ))      ESCAPE (AVE_GAL_INDEX     ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_CHISQ"  ))      ESCAPE (AVE_GAL_CHISQ     ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_NPIX"   ))      ESCAPE (AVE_GAL_NPIX      ,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "GAL_TYPE"   ))      ESCAPE (AVE_GAL_TYPE      ,   OPIHI_FLT);
+
   if (!strcasecmp (fieldName, "E_BV"))             ESCAPE (AVE_E_BV          ,   OPIHI_FLT);
   if (!strcasecmp (fieldName, "E_BV_ERR"))         ESCAPE (AVE_E_BV_ERR      ,   OPIHI_FLT);