Index: trunk/Ohana/src/opihi/dvo/extract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/extract.c	(revision 7917)
+++ trunk/Ohana/src/opihi/dvo/extract.c	(revision 12332)
@@ -119,6 +119,6 @@
   if (PhotcodeSelect) {
     Ns = GetPhotcodeNsec (code[0].code);
-    if ((mode != REF) && (code[0].type != PHOT_SEC) && (code[0].type != PHOT_PRI)) {
-      gprint (GP_ERR, "filter must be a PRIMARY or SECONDARY photometry type\n");
+    if ((mode != REF) && (code[0].type != PHOT_SEC)) {
+      gprint (GP_ERR, "filter must be a average photometry type\n");
       return (FALSE);
     }
@@ -341,5 +341,5 @@
 	  Ncode = 0;
 	  for (k = 0; k < catalog.average[i].Nm; k++, m++) {
-	    if (code[0].code != GetPhotcodeEquivCodebyCode (catalog.measure[m].source)) continue;
+	    if (code[0].code != GetPhotcodeEquivCodebyCode (catalog.measure[m].photcode)) continue;
 	    Ncode ++;
 	  }
@@ -357,6 +357,6 @@
 	  Ncode = 0;
 	  for (k = 0; k < catalog.average[i].Nm; k++, m++) {
-	    if (code[0].code != GetPhotcodeEquivCodebyCode (catalog.measure[m].source)) continue;
-	    if (catalog.measure[m].source & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
+	    if (code[0].code != GetPhotcodeEquivCodebyCode (catalog.measure[m].photcode)) continue;
+	    if (catalog.measure[m].photcode & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
 	    Ncode ++;
 	  }
@@ -407,5 +407,5 @@
 	  vec[0].elements[N] = -32;
 	  for (k = 0; k < catalog.average[i].Nm; k++) {
-	    if (catalog.measure[m+k].source == N1) {
+	    if (catalog.measure[m+k].photcode == N1) {
 	      vec[0].elements[N] = PhotCat (&catalog.measure[m+k]);
 	      k = catalog.average[i].Nm;