Changeset 37010 for branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractAverages.c

Timestamp:

Jul 15, 2014, 3:04:25 PM (12 years ago)

Author:

eugene

Message:

update dbExtractAverages for new photcode-based element UI

File:

• branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractAverages.c (modified) (1 diff)

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

@@ -181 +181 @@
       break;
 
+    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;
+      }
+
+      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:
+              // why is measure 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:
+              // value.Flt = PhotFluxRef  (equiv, 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 (equiv, 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:
+        case MAG_OPTION_CHISQ:
+        case MAG_OPTION_MIN:
+        case MAG_OPTION_MAX:
+        case MAG_OPTION_NCODE: {
+          int Nsec = GetPhotcodeNsec (field->photcode->code);
+          if (Nsec == -1) break;
+          value.Int = secfilt[Nsec].Ncode;
+          break;
+        }
+        case MAG_OPTION_NPHOT: {
+          int Nsec = GetPhotcodeNsec (field->photcode->code);
+          if (Nsec == -1) break;
+          value.Int = secfilt[Nsec].Nused;
+          break;
+        }
+        case MAG_OPTION_UC_DIST:
+        case MAG_OPTION_STACK_DET_ID:
+          value.Int = PhotStackID (field->photcode, average, secfilt);
+          break;
+        case MAG_OPTION_FLAGS: {
+          int Nsec = GetPhotcodeNsec (field->photcode->code);
+          if (Nsec == -1) break;
+          value.Int = secfilt[Nsec].flags;
+          break;
+        }
+        case MAG_OPTION_NONE:
+          break;
+      }
+      break;
+
 # if (0)
-    case AVE_MAG:
       switch (field->magMode) {
         case MAG_AVE: