Index: /trunk/Ohana/src/libdvo/include/dvodb.h
===================================================================
--- /trunk/Ohana/src/libdvo/include/dvodb.h	(revision 39461)
+++ /trunk/Ohana/src/libdvo/include/dvodb.h	(revision 39462)
@@ -315,4 +315,5 @@
       AVE_NGALPHOT, 
       AVE_NPOS, 
+      AVE_NWARP_OK, 
       AVE_OBJ_FLAGS, 
       AVE_TYPE, 
@@ -322,4 +323,6 @@
       AVE_EXTID_HI,
       AVE_EXTID_LO,
+      AVE_PHOT_FLAGS_HI,
+      AVE_PHOT_FLAGS_LO,
       AVE_REF_COLOR_BLUE,
       AVE_REF_COLOR_RED,
Index: /trunk/Ohana/src/libdvo/src/dbExtractAverages.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/dbExtractAverages.c	(revision 39461)
+++ /trunk/Ohana/src/libdvo/src/dbExtractAverages.c	(revision 39462)
@@ -143,4 +143,7 @@
       value.Int = average[0].Npos;
       break;
+    case AVE_NWARP_OK:
+      value.Int = average[0].NwarpOK;
+      break;
 
     case AVE_CHISQ_POS:
@@ -195,4 +198,11 @@
     case AVE_EXTID_LO:
       value.Int = (0x00000000FFFFFFFF & average[0].extID);
+      break;
+
+    case AVE_PHOT_FLAGS_HI:
+      value.Int = average[0].photFlagsUpper;
+      break;
+    case AVE_PHOT_FLAGS_LO:
+      value.Int = average[0].photFlagsLower;
       break;
 
Index: /trunk/Ohana/src/libdvo/src/dbFields.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/dbFields.c	(revision 39461)
+++ /trunk/Ohana/src/libdvo/src/dbFields.c	(revision 39462)
@@ -725,4 +725,5 @@
   if (!strcasecmp (fieldName, "NPOS"))        ESCAPE (AVE_NPOS,        OPIHI_INT);
   if (!strcasecmp (fieldName, "NASTROM"))     ESCAPE (AVE_NPOS,        OPIHI_INT);
+  if (!strcasecmp (fieldName, "NWARP_OK"))    ESCAPE (AVE_NWARP_OK,    OPIHI_INT);
   if (!strcasecmp (fieldName, "FLAGS"))       ESCAPE (AVE_OBJ_FLAGS,   OPIHI_INT);
   if (!strcasecmp (fieldName, "OBJ_FLAGS"))   ESCAPE (AVE_OBJ_FLAGS,   OPIHI_INT);
@@ -732,6 +733,14 @@
   if (!strcasecmp (fieldName, "EXTID_HI"))    ESCAPE (AVE_EXTID_HI,    OPIHI_INT);
   if (!strcasecmp (fieldName, "EXTID_LO"))    ESCAPE (AVE_EXTID_LO,    OPIHI_INT);
-  if (!strcasecmp (fieldName, "REF_COLOR_BLUE")) ESCAPE (AVE_REF_COLOR_BLUE, OPIHI_FLT);
-  if (!strcasecmp (fieldName, "REF_COLOR_RED"))  ESCAPE (AVE_REF_COLOR_RED,  OPIHI_FLT);
+  if (!strcasecmp (fieldName, "PHOTFLAGS_HI"))     ESCAPE (AVE_PHOT_FLAGS_HI, OPIHI_INT);
+  if (!strcasecmp (fieldName, "PHOTFLAGS_LO"))     ESCAPE (AVE_PHOT_FLAGS_LO, OPIHI_INT);
+  if (!strcasecmp (fieldName, "PHOT_FLAGS_HI"))    ESCAPE (AVE_PHOT_FLAGS_HI, OPIHI_INT);
+  if (!strcasecmp (fieldName, "PHOT_FLAGS_LO"))    ESCAPE (AVE_PHOT_FLAGS_LO, OPIHI_INT);
+  if (!strcasecmp (fieldName, "PHOTFLAGS_UPPER"))  ESCAPE (AVE_PHOT_FLAGS_HI, OPIHI_INT);
+  if (!strcasecmp (fieldName, "PHOTFLAGS_LOWER"))  ESCAPE (AVE_PHOT_FLAGS_LO, OPIHI_INT);
+  if (!strcasecmp (fieldName, "PHOT_FLAGS_UPPER")) ESCAPE (AVE_PHOT_FLAGS_HI, OPIHI_INT);
+  if (!strcasecmp (fieldName, "PHOT_FLAGS_LOWER")) ESCAPE (AVE_PHOT_FLAGS_LO, OPIHI_INT);
+  if (!strcasecmp (fieldName, "REF_COLOR_BLUE"))   ESCAPE (AVE_REF_COLOR_BLUE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "REF_COLOR_RED"))    ESCAPE (AVE_REF_COLOR_RED,  OPIHI_FLT);
 
   if (!strcasecmp (fieldName, "E_BV"))             ESCAPE (AVE_E_BV          ,   OPIHI_FLT);
Index: /trunk/Ohana/src/libdvo/src/dvo_catalog.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/dvo_catalog.c	(revision 39461)
+++ /trunk/Ohana/src/libdvo/src/dvo_catalog.c	(revision 39462)
@@ -183,5 +183,5 @@
   average->Nlensobj        = 0;
   average->Nstarpar        = 0;
-  average->Ngalphot       = 0;
+  average->Ngalphot        = 0;
 
   average->measureOffset   = -1;
@@ -190,5 +190,5 @@
   average->lensobjOffset   = -1;
   average->starparOffset   = -1;
-  average->galphotOffset  = -1;
+  average->galphotOffset   = -1;
 
   average->refColorBlue    = NAN;
@@ -199,5 +199,5 @@
   average->projectionID    = 0;
 
-  average->dummy           = 0;
+  average->NwarpOK         = 0;
 
   average->flags           = 0;
Index: /trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c
===================================================================
--- /trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c	(revision 39461)
+++ /trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c	(revision 39462)
@@ -165,75 +165,4 @@
     dvo_average_init (&out[i]);
 
-    out[i].R        	 = in[i].R;      
-    out[i].D        	 = in[i].D;      
-    out[i].dR       	 = in[i].dR;
-    out[i].dD       	 = in[i].dD;
-    out[i].uR       	 = in[i].uR;
-    out[i].uD       	 = in[i].uD;
-    out[i].duR      	 = in[i].duR;
-    out[i].duD      	 = in[i].duD;
-    out[i].P        	 = in[i].P;
-    out[i].dP       	 = in[i].dP;
-
-    out[i].Rstk        	 = in[i].Rstk;      
-    out[i].Dstk        	 = in[i].Dstk;      
-    out[i].dRstk       	 = in[i].dRstk;
-    out[i].dDstk       	 = in[i].dDstk;
-
-    out[i].ChiSqAve    	 = in[i].ChiSqAve;     
-    out[i].ChiSqPM    	 = in[i].ChiSqPM;     
-    out[i].ChiSqPar    	 = in[i].ChiSqPar;     
-    out[i].Tmean    	 = in[i].Tmean;     
-    out[i].Trange   	 = in[i].Trange;     
-
-    out[i].psfQF         = in[i].psfQF;
-    out[i].psfQFperf     = in[i].psfQFperf;
-    out[i].stargal     	 = in[i].stargal;     
-    out[i].Npos       	 = in[i].Npos;     
-
-    out[i].Nmeasure      = in[i].Nmeasure;     
-    out[i].Nmissing      = in[i].Nmissing;     
-    out[i].Nlensing      = in[i].Nlensing;     
-    out[i].Nlensobj      = in[i].Nlensobj;     
-    out[i].Nstarpar      = in[i].Nstarpar;     
-    out[i].Ngalphot     = in[i].Ngalphot;     
-
-    out[i].measureOffset = in[i].measureOffset; 
-    out[i].missingOffset = in[i].missingOffset;
-    out[i].lensingOffset = in[i].lensingOffset;
-    out[i].lensobjOffset = in[i].lensobjOffset;
-    out[i].starparOffset = in[i].starparOffset;
-    out[i].galphotOffset  = in[i].galphotOffset;
-
-    out[i].refColorBlue  = in[i].refColorBlue;
-    out[i].refColorRed   = in[i].refColorRed;
-
-    out[i].tessID        = in[i].tessID;
-    out[i].skycellID     = in[i].skycellID;
-    out[i].projectionID  = in[i].projectionID;
-
-    out[i].flags     	 = in[i].flags;   
-    out[i].photFlagsUpper = in[i].photFlagsUpper;   
-    out[i].photFlagsLower = in[i].photFlagsLower;   
-    out[i].objID 	 = in[i].objID;
-    out[i].catID 	 = in[i].catID;
-    out[i].extID 	 = in[i].extID;
-
-    out[i].uRgal 	 = in[i].uRgal;
-    out[i].uDgal 	 = in[i].uDgal;
-  }
-  return (out);
-}
-
-// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
-Average_PS1_V5 *AverageInternalTo_PS1_V5 (Average *in, off_t Nvalues, SecFilt *primary) {
-  OHANA_UNUSED_PARAM(primary);
-
-  off_t i;
-  Average_PS1_V5 *out;
-
-  ALLOCATE_ZERO (out, Average_PS1_V5, Nvalues);
-
-  for (i = 0; i < Nvalues; i++) {
     out[i].R        	  = in[i].R;      
     out[i].D        	  = in[i].D;      
@@ -253,4 +182,77 @@
 			  
     out[i].ChiSqAve    	  = in[i].ChiSqAve;     
+    out[i].ChiSqPM    	  = in[i].ChiSqPM;     
+    out[i].ChiSqPar    	  = in[i].ChiSqPar;     
+    out[i].Tmean    	  = in[i].Tmean;     
+    out[i].Trange   	  = in[i].Trange;     
+			  
+    out[i].psfQF          = in[i].psfQF;
+    out[i].psfQFperf      = in[i].psfQFperf;
+    out[i].stargal     	  = in[i].stargal;     
+    out[i].Npos       	  = in[i].Npos;     
+			  
+    out[i].Nmeasure       = in[i].Nmeasure;     
+    out[i].Nmissing       = in[i].Nmissing;     
+    out[i].Nlensing       = in[i].Nlensing;     
+    out[i].Nlensobj       = in[i].Nlensobj;     
+    out[i].Nstarpar       = in[i].Nstarpar;     
+    out[i].Ngalphot       = in[i].Ngalphot;     
+			  
+    out[i].measureOffset  = in[i].measureOffset; 
+    out[i].missingOffset  = in[i].missingOffset;
+    out[i].lensingOffset  = in[i].lensingOffset;
+    out[i].lensobjOffset  = in[i].lensobjOffset;
+    out[i].starparOffset  = in[i].starparOffset;
+    out[i].galphotOffset  = in[i].galphotOffset;
+
+    out[i].refColorBlue   = in[i].refColorBlue;
+    out[i].refColorRed    = in[i].refColorRed;
+			  
+    out[i].tessID         = in[i].tessID;
+    out[i].skycellID      = in[i].skycellID;
+    out[i].projectionID   = in[i].projectionID;
+			  
+    out[i].NwarpOK     	  = in[i].NwarpOK;   
+
+    out[i].flags     	  = in[i].flags;   
+    out[i].photFlagsUpper = in[i].photFlagsUpper;   
+    out[i].photFlagsLower = in[i].photFlagsLower;   
+    out[i].objID 	  = in[i].objID;
+    out[i].catID 	  = in[i].catID;
+    out[i].extID 	  = in[i].extID;
+			  
+    out[i].uRgal 	  = in[i].uRgal;
+    out[i].uDgal 	  = in[i].uDgal;
+  }
+  return (out);
+}
+
+// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
+Average_PS1_V5 *AverageInternalTo_PS1_V5 (Average *in, off_t Nvalues, SecFilt *primary) {
+  OHANA_UNUSED_PARAM(primary);
+
+  off_t i;
+  Average_PS1_V5 *out;
+
+  ALLOCATE_ZERO (out, Average_PS1_V5, Nvalues);
+
+  for (i = 0; i < Nvalues; i++) {
+    out[i].R        	  = in[i].R;      
+    out[i].D        	  = in[i].D;      
+    out[i].dR       	  = in[i].dR;
+    out[i].dD       	  = in[i].dD;
+    out[i].uR       	  = in[i].uR;
+    out[i].uD       	  = in[i].uD;
+    out[i].duR      	  = in[i].duR;
+    out[i].duD      	  = in[i].duD;
+    out[i].P        	  = in[i].P;
+    out[i].dP       	  = in[i].dP;
+			  
+    out[i].Rstk        	  = in[i].Rstk;      
+    out[i].Dstk        	  = in[i].Dstk;      
+    out[i].dRstk       	  = in[i].dRstk;
+    out[i].dDstk       	  = in[i].dDstk;
+			  
+    out[i].ChiSqAve    	  = in[i].ChiSqAve;     
     out[i].ChiSqPM     	  = in[i].ChiSqPM;     
     out[i].ChiSqPar   	  = in[i].ChiSqPar;     
@@ -284,4 +286,6 @@
     out[i].projectionID   = in[i].projectionID;
 			  
+    out[i].NwarpOK     	  = in[i].NwarpOK;   
+
     out[i].flags     	  = in[i].flags;   
     out[i].photFlagsUpper = in[i].photFlagsUpper;