Changeset 37848

Timestamp:

Jan 17, 2015, 5:51:44 AM (12 years ago)

Author:

eugene

Message:

add options to extract joined measures in avextract

Location:

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

Files:

• include/dvodb.h (modified) (4 diffs)
• src/dbExtractAverages.c (modified) (6 diffs)

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

@@ -236 +236 @@
       MEAS_RA_GALMODEL,      // model pm prediction
       MEAS_DEC_GALMODEL,     // model pm prediction
-};
+} dvoMeasureType;
 
 /* average fields */
@@ -288 +288 @@
       AVE_RA_GALMODEL,      // model pm prediction
       AVE_DEC_GALMODEL,     // model pm prediction
-};
+} dvoAverageType;
 
 //       AVE_NPHOT, 
@@ -364 +364 @@
       IMAGE_REF_COLOR_BLUE,
       IMAGE_REF_COLOR_RED
-};
+} dvoImageType;
 
 enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE, DVO_TABLE_IMAGE};
@@ -382 +382 @@
   int extract;
   int table;
-  int ID;
+  int ID; // may be either dvoMeasureType or dvoAverageType
 
   dvoMagSourceType magSource; // chip, (forced) warp, stack [only relevant for averages]

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

@@ -53 +53 @@
 
   // off_t i;
+  int n;
   dbValue value;
 
@@ -186 +187 @@
     case AVE_PHOT:
       // if we request mag:ave, use equiv for photcode (ie a given measure, say GPC1.g.XY01, will return g for mag:ave)
-      if  (field->photcode->type == PHOT_MAG) {
-        // this is an error
-        break;
-      }
-
-      // if we ask for 2MASS_K, etc (REF values), return NAN unless measure->code matches
-      if (field->photcode->type == PHOT_REF) {
-        // need to ensure measure exists.
-        break;
-      }
-
-      // if we ask for GPC1.g.XY03:rel, etc (DEP values), return NAN unless measure->code matches
-      if (field->photcode->type == PHOT_DEP) {
-        // again.
-        break;
-      }
-
-      /* in some cases below we need a measurement which matches the requested photcode.
-         here is some sample code to find this.
-
-          for (i = 0; i < average[0].Nmeasure; i++) {
-            if (field->photcode->code != measure[i].photcode) continue;
-            value.Flt = measure[i].M;
-            break;
-          }
-      */
+
+      // this is an error (no exposed photcodes should be of type PHOT_MAG)
+      if  (field->photcode->type == PHOT_MAG) break;
 
       switch (field->magOption) {
@@ -220 +198 @@
               break;
             case MAG_LEVEL_REF:
-              // which measure is needed here?
-              // PhotRef  (field->photcode, average, secfilt, measure, field->magClass, field->magSource); 
               break;
             case MAG_LEVEL_INST:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotInst (&measure[n], field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_CAT:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotCat (&measure[n], field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_SYS:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotSys  (&measure[n], average, secfilt, field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_REL:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotRel (&measure[n], average, secfilt, field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_CAL:
             case MAG_LEVEL_NONE:
@@ -243 +247 @@
             case MAG_LEVEL_SYS:
             case MAG_LEVEL_REL:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotErr (&measure[n], field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_CAL:
             case MAG_LEVEL_NONE:
@@ -259 +270 @@
               break;
             case MAG_LEVEL_INST:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotFluxInst (&measure[n], field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_CAT:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotFluxCat (&measure[n], field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_SYS:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotFluxSys (&measure[n], average, secfilt, field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_REL:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotFluxRel (&measure[n], average, secfilt, field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_CAL:
             case MAG_LEVEL_NONE:
@@ -278 +317 @@
             case MAG_LEVEL_SYS:
             case MAG_LEVEL_REL:
+              // find an appropriate measure (if one exists)
+              for (n = 0; n < average->Nmeasure; n++) {
+                if (field->photcode->code != measure[n].photcode) continue;
+                value.Flt = PhotFluxInstErr (&measure[n], field->magClass); 
+                break;
+              }
+              break;
             case MAG_LEVEL_CAL:
             case MAG_LEVEL_NONE: