Changeset 37719

Timestamp:

Dec 5, 2014, 4:14:46 PM (12 years ago)

Author:

eugene

Message:

add methods to get red and blue ref color terms

Location:

branches/eam_branches/ipp-20140904/Ohana/src/libdvo

Files:

• include/dvodb.h (modified) (3 diffs)
• src/dbExtractAverages.c (modified) (1 diff)
• src/dbExtractImages.c (modified) (1 diff)
• src/dbExtractMeasures.c (modified) (1 diff)
• src/dbFields.c (modified) (3 diffs)

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

@@ -202 +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, 
@@ -272 +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)
@@ -360 +362 @@
       IMAGE_NLINK_PHOTOM,
       IMAGE_NLINK_ASTROM,
-      IMAGE_REF_COLOR
+      IMAGE_REF_COLOR_BLUE,
+      IMAGE_REF_COLOR_RED
 };
 

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dbExtractAverages.c

@@ -161 +161 @@
       value.Flt = average[0].stargal;
       break;
-    case AVE_REF_COLOR:
+    case AVE_REF_COLOR_BLUE:
       value.Flt = average[0].refColorBlue;
+      break;
+    case AVE_REF_COLOR_RED:
+      value.Flt = average[0].refColorRed;
       break;
 

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dbExtractImages.c

@@ -365 +365 @@
       break;
 
-    case IMAGE_REF_COLOR:
+    case IMAGE_REF_COLOR_BLUE:
       value.Flt = image[N].refColorBlue;
+      break;
+    case IMAGE_REF_COLOR_RED:
+      value.Flt = image[N].refColorRed;
       break;
   }

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -503 +503 @@
       break;
 
-    case MEAS_REF_COLOR:
+    case MEAS_REF_COLOR_BLUE:
       value.Flt = average[0].refColorBlue;
+      break;
+    case MEAS_REF_COLOR_RED:
+      value.Flt = average[0].refColorRed;
       break;
 

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dbFields.c

@@ -555 +555 @@
   // if (!strcasecmp (fieldName, "FLUX_KRON"))      ESCAPE (MEAS_FLUX_KRON,      OPIHI_FLT);
   // if (!strcasecmp (fieldName, "FLUX_KRON_ERR"))  ESCAPE (MEAS_FLUX_KRON_ERR,  OPIHI_FLT);
-  if (!strcasecmp (fieldName, "REF_COLOR"))      ESCAPE (MEAS_REF_COLOR,      OPIHI_FLT);
+  if (!strcasecmp (fieldName, "REF_COLOR_BLUE"))    ESCAPE (MEAS_REF_COLOR_BLUE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "REF_COLOR_RED"))     ESCAPE (MEAS_REF_COLOR_RED,  OPIHI_FLT);
 
   // for words that don't parse, try a photcode
@@ -630 +631 @@
   if (!strcasecmp (fieldName, "EXTID_HI"))    ESCAPE (AVE_EXTID_HI,    OPIHI_INT);
   if (!strcasecmp (fieldName, "EXTID_LO"))    ESCAPE (AVE_EXTID_LO,    OPIHI_INT);
-  if (!strcasecmp (fieldName, "REF_COLOR"))   ESCAPE (AVE_REF_COLOR,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "REF_COLOR_BLUE")) ESCAPE (AVE_REF_COLOR_BLUE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "REF_COLOR_RED"))  ESCAPE (AVE_REF_COLOR_RED,  OPIHI_FLT);
 
   if (!strcasecmp (fieldName, "E_BV"))             ESCAPE (AVE_E_BV          ,   OPIHI_FLT);
@@ -774 +776 @@
   if (!strcasecmp (fieldName, "NLINK_PHOTOM")) ESCAPE (IMAGE_NLINK_PHOTOM, OPIHI_INT);
   if (!strcasecmp (fieldName, "NLINK_ASTROM")) ESCAPE (IMAGE_NLINK_ASTROM, OPIHI_INT);
-  if (!strcasecmp (fieldName, "REF_COLOR"))    ESCAPE (IMAGE_REF_COLOR,    OPIHI_FLT);
+  if (!strcasecmp (fieldName, "REF_COLOR_BLUE")) ESCAPE (IMAGE_REF_COLOR_BLUE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "REF_COLOR_RED"))  ESCAPE (IMAGE_REF_COLOR_RED,  OPIHI_FLT);
 
   // for words that don't parse, try a photcode