Changeset 14401 for trunk/Ohana/src/opihi/dvo/dbExtractAverages.c

Timestamp:

Aug 4, 2007, 10:15:51 AM (19 years ago)

Author:

eugene

Message:

extensive updates to the avextract / mextract / skyregion system

File:

• trunk/Ohana/src/opihi/dvo/dbExtractAverages.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/dbExtractAverages.c

@@ -4 +4 @@
 double dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
 
-  int i;
+  int i, Nsec;
   double value;
 
@@ -78 +78 @@
           }
           break;
+        case MAG_CHISQ:
+          // GetPhotcodeEquivCodebyCode (field->photcode)
+          value = PhotXm (field->photcode, average, secfilt);
+          break;
+        case MAG_ERR:
+          // GetPhotcodeEquivCodebyCode (field->photcode)
+          value = PhotdM (field->photcode, average, secfilt);
+          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);
+          if (Nsec == -1) break;
+          value = secfilt[Nsec].Ncode;
+          break;
+        case MAG_NPHOT:
+          Nsec = GetPhotcodeNsec (field->photcode->code);
+          if (Nsec == -1) break;
+          value = secfilt[Nsec].Nused;
+          break;
+
       }
       break;
@@ -90 +111 @@
     case AVE_TYPEFRAC:
       break;
+      /*
     case AVE_NCODE:
       value = 0;
@@ -107 +129 @@
     case AVE_NCRIT:
       break;
+      */
   }
   return (value);