Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/libdvo/src/dbExtractAverages.c

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libdvo/src/dbExtractAverages.c (modified) (4 diffs)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/libdvo/src/dbExtractAverages.c

@@ -52 +52 @@
 dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
 
-  off_t i;
-  int Nsec;
+  // off_t i;
   dbValue value;
 
@@ -162 +161 @@
       value.Flt = average[0].stargal;
       break;
+    case AVE_REF_COLOR:
+      value.Flt = average[0].refColorBlue;
+      break;
 
     case AVE_OBJ_FLAGS:
@@ -179 +181 @@
       break;
 
-    case AVE_MAG:
-      switch (field->magMode) {
-        case MAG_AVE:
-          value.Flt = PhotAve  (field->photcode, average, secfilt);
-          break;
-        case MAG_REF:
-          value.Flt = PhotRef  (field->photcode, average, secfilt, measure);
-          break;
-        case MAG_INST:
-        case MAG_CAT:
-        case MAG_SYS:
-        case MAG_REL:
-        case MAG_CAL:
-          // XXX need to code this correctly: this returns just the first matching value
-          value.Flt = NAN;
+    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;
@@ -199 +208 @@
             break;
           }
-          break;
-        case MAG_CHISQ:
+      */
+
+      switch (field->magOption) {
+        case MAG_OPTION_MAG:
+          switch (field->magLevel) {
+            case MAG_LEVEL_AVE:
+              value.Flt = PhotAve  (field->photcode, average, secfilt, field->magClass, field->magSource); 
+              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:
+            case MAG_LEVEL_CAT:
+            case MAG_LEVEL_SYS:
+            case MAG_LEVEL_REL:
+            case MAG_LEVEL_CAL:
+            case MAG_LEVEL_NONE:
+              break;
+          }
+          break;
+
+        case MAG_OPTION_ERR:
+          switch (field->magLevel) {
+            case MAG_LEVEL_AVE:
+            case MAG_LEVEL_REF:
+              value.Flt = PhotAveErr (field->photcode, average, secfilt, field->magClass, field->magSource);  
+              break;
+            case MAG_LEVEL_INST:
+            case MAG_LEVEL_CAT:
+            case MAG_LEVEL_SYS:
+            case MAG_LEVEL_REL:
+            case MAG_LEVEL_CAL:
+            case MAG_LEVEL_NONE:
+              break;
+          }
+          break;
+
+        case MAG_OPTION_FLUX:
+          switch (field->magLevel) {
+            case MAG_LEVEL_AVE:
+              value.Flt = PhotFluxAve  (field->photcode, average, secfilt, field->magClass, field->magSource); 
+              break;
+            case MAG_LEVEL_REF:
+              // XXX which measure is needed here?
+              // value.Flt = PhotFluxRef  (field->photcode, average, secfilt, measure, field->magClass, field->magSource); 
+              break;
+            case MAG_LEVEL_INST:
+            case MAG_LEVEL_CAT:
+            case MAG_LEVEL_SYS:
+            case MAG_LEVEL_REL:
+            case MAG_LEVEL_CAL:
+            case MAG_LEVEL_NONE:
+              break;
+          }
+          break;
+
+        case MAG_OPTION_FLUX_ERR:
+          switch (field->magLevel) {
+            case MAG_LEVEL_AVE:
+            case MAG_LEVEL_REF:
+              value.Flt = PhotFluxAveErr (field->photcode, average, secfilt, field->magClass, field->magSource);  
+              break;
+            case MAG_LEVEL_INST:
+            case MAG_LEVEL_CAT:
+            case MAG_LEVEL_SYS:
+            case MAG_LEVEL_REL:
+            case MAG_LEVEL_CAL:
+            case MAG_LEVEL_NONE:
+              break;
+          }
+          break;
+
+        case MAG_OPTION_STDEV:
+          value.Flt = PhotMstdev (field->photcode, average, secfilt, field->magClass, field->magSource);
+          break;
+        case MAG_OPTION_CHISQ:
           value.Flt = PhotXm (field->photcode, average, secfilt);
           break;
-        case MAG_ERR:
-          if ((field->photcode->type == PHOT_REF) || (field->photcode->type == PHOT_DEP)) {
-            for (i = 0; i < average[0].Nmeasure; i++) {
-              if (field->photcode->code != measure[i].photcode) continue;
-              value.Flt = measure[i].dM;
-              break;
-            }
-          } else {
-            value.Flt = PhotAveErr (field->photcode, average, secfilt);
-          }
-          break;
-        case MAG_STDEV:
-          value.Flt = PhotMstdev (field->photcode, average, secfilt);
-          break;
-        case MAG_PHOT_FLAGS:
-          if ((field->photcode->type == PHOT_REF) || (field->photcode->type == PHOT_DEP)) {
-            for (i = 0; i < average[0].Nmeasure; i++) {
-              if (field->photcode->code != measure[i].photcode) continue;
-              value.Int = measure[i].photFlags;
-              break;
-            }
-          } else {
-            Nsec = GetPhotcodeNsec (field->photcode->code);
-            if (Nsec == -1) break;
-            value.Int = secfilt[Nsec].flags;
-          }
-          break;
-        case MAG_NCODE:
-          // XXX push these into dvo_photcode_ops APIs
-          // XXX do I need to allow for conversion to equiv?
-          Nsec = GetPhotcodeNsec (field->photcode->code);
+        case MAG_OPTION_MIN:
+          value.Flt = PhotMmin (field->photcode, average, secfilt);
+          break;
+        case MAG_OPTION_MAX:
+          value.Flt = PhotMmax (field->photcode, average, secfilt);
+          break;
+        case MAG_OPTION_NCODE: {
+          int Nsec = GetPhotcodeNsec (field->photcode->code);
           if (Nsec == -1) break;
           value.Int = secfilt[Nsec].Ncode;
           break;
-        case MAG_NPHOT:
-          Nsec = GetPhotcodeNsec (field->photcode->code);
+        }
+        case MAG_OPTION_NPHOT: {
+          value.Int = PhotNphot (field->photcode, average, secfilt, field->magClass, field->magSource);
+          break;
+        }
+        case MAG_OPTION_UC_DIST:
+          value.Flt = PhotUCdist (field->photcode, average, secfilt);
+          break;
+        // XX case MAG_OPTION_STACK_DET_ID:
+        // XX   value.Int = PhotStackID (field->photcode, average, secfilt);
+        // XX   break;
+        case MAG_OPTION_FLAGS: {
+          int Nsec = GetPhotcodeNsec (field->photcode->code);
           if (Nsec == -1) break;
-          value.Int = secfilt[Nsec].Nused;
-          break;
-
-        case MAG_APER:
-        case MAG_APER_AVE:
-          value.Flt = PhotAperAve (field->photcode, average, secfilt);
-          break;
-
-        case MAG_APER_REF:
-          value.Flt = PhotAperRef (field->photcode, average, secfilt, measure);
-          break;
-
-        case MAG_KRON:
-        case MAG_KRON_AVE:
-          value.Flt = PhotKronAve (field->photcode, average, secfilt);
-          break;
-
-        case MAG_KRON_REF:
-          value.Flt = PhotKronRef (field->photcode, average, secfilt, measure);
-          break;
-
-        case MAG_KRON_ERR:
-          value.Flt = PhotKronAveErr (field->photcode, average, secfilt);
-          break;
-
-        case MAG_20:
-          value.Flt = PhotM20 (field->photcode, average, secfilt);
-          break;
-        case MAG_80:
-          value.Flt = PhotM80 (field->photcode, average, secfilt);
-          break;
-        case MAG_UC_DIST:
-          value.Flt = PhotUCdist (field->photcode, average, secfilt);
-          break;
-        case MAG_STACK_DET_ID:
-          value.Int = PhotStackID (field->photcode, average, secfilt);
-          break;
-
-        case MAG_FLUX_PSF:
-          value.Flt = PhotAveFluxPSF (field->photcode, average, secfilt);
-          break;
-        case MAG_FLUX_PSF_ERR:
-          value.Flt = PhotAvedFluxPSF (field->photcode, average, secfilt);
-          break;
-        case MAG_FLUX_KRON:
-          value.Flt = PhotAveFluxKron (field->photcode, average, secfilt);
-          break;
-        case MAG_FLUX_KRON_ERR:
-          value.Flt = PhotAvedFluxKron (field->photcode, average, secfilt);
-          break;
-      }
-      break;
-    case AVE_dMAG:
-      value.Flt = PhotAveErr (field->photcode, average, secfilt);
-      break;
-    case AVE_Xm:
-      value.Flt = PhotXm (field->photcode, average, secfilt);
-      break;
+          value.Int = secfilt[Nsec].flags;
+          break;
+        }
+        case MAG_OPTION_NONE:
+          break;
+      }
+      break;
+
     case AVE_TYPE:
       break;