Index: trunk/Ohana/src/opihi/dvo/dbExtractAverages.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dbExtractAverages.c	(revision 13479)
+++ trunk/Ohana/src/opihi/dvo/dbExtractAverages.c	(revision 14401)
@@ -4,5 +4,5 @@
 double dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
 
-  int i;
+  int i, Nsec;
   double value;
 
@@ -78,4 +78,25 @@
 	  }
 	  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,4 +111,5 @@
     case AVE_TYPEFRAC:
       break;
+      /*
     case AVE_NCODE:
       value = 0;
@@ -107,4 +129,5 @@
     case AVE_NCRIT:
       break;
+      */
   }
   return (value);