Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c	(revision 15035)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c	(revision 15038)
@@ -15,30 +15,32 @@
     out[i].dD         = in[i].dD;
     out[i].M          = in[i].M;
-    out[i].dM         = in[i].dM;
     out[i].Mcal       = in[i].Mcal;
     out[i].Mgal       = in[i].Mgal;
+    out[i].dM         = in[i].dM;
+    out[i].dt         = in[i].dt;
     out[i].airmass    = in[i].airmass;
     out[i].az         = in[i].az;
-    out[i].dt         = in[i].dt;
+    out[i].Xccd       = in[i].Xccd;
+    out[i].Yccd       = in[i].Yccd;
+    out[i].Sky        = in[i].Sky;
+    out[i].dSky       = in[i].dSky;
+    out[i].t          = in[i].t;
+    out[i].averef     = in[i].averef;
+    out[i].detID      = in[i].detID;
+    out[i].imageID    = in[i].imageID;
+    out[i].qPSF       = in[i].qPSF;
+    out[i].psfProb    = in[i].psfProb;
+    out[i].crNsigma   = in[i].crNsigma;
+    out[i].extNsigma  = in[i].extNsigma;
     out[i].FWx 	      = in[i].FWx;
     out[i].FWy 	      = in[i].FWy;
     out[i].theta      = in[i].theta;
-    out[i].dophot     = in[i].dophot;
     out[i].photcode   = in[i].photcode;
-    out[i].t          = in[i].t;
-    out[i].averef     = in[i].averef;
-    out[i].flags      = in[i].flags;
-    out[i].Xccd       = in[i].Xccd;
-    out[i].Yccd       = in[i].Yccd;
     out[i].dXccd      = in[i].dXccd;
     out[i].dYccd      = in[i].dYccd;
+    out[i].dbFlags    = in[i].dbFlags;
+    out[i].photFlags  = in[i].photFlags;
     out[i].stargal    = in[i].stargal;
-    out[i].Sky        = in[i].Sky;
-    out[i].dSky       = in[i].dSky;
-    out[i].qPSF       = in[i].qPSF;
-    out[i].detID_hi   = in[i].detID_hi;
-    out[i].detID_lo   = in[i].detID_lo;
-    out[i].imageID_hi = in[i].imageID_hi;
-    out[i].imageID_lo = in[i].imageID_lo;
+    out[i].dophot     = in[i].dophot;
   }
   return (out);
@@ -57,30 +59,32 @@
     out[i].dD         = in[i].dD;
     out[i].M          = in[i].M;
-    out[i].dM         = in[i].dM;
     out[i].Mcal       = in[i].Mcal;
     out[i].Mgal       = in[i].Mgal;
+    out[i].dM         = in[i].dM;
+    out[i].dt         = in[i].dt;
     out[i].airmass    = in[i].airmass;
     out[i].az         = in[i].az;
-    out[i].dt         = in[i].dt;
+    out[i].Xccd       = in[i].Xccd;
+    out[i].Yccd       = in[i].Yccd;
+    out[i].Sky        = in[i].Sky;
+    out[i].dSky       = in[i].dSky;
+    out[i].t          = in[i].t;
+    out[i].averef     = in[i].averef;
+    out[i].detID      = in[i].detID;
+    out[i].imageID    = in[i].imageID;
+    out[i].qPSF       = in[i].qPSF;
+    out[i].psfProb    = in[i].psfProb;
+    out[i].crNsigma   = in[i].crNsigma;
+    out[i].extNsigma  = in[i].extNsigma;
     out[i].FWx 	      = in[i].FWx;
     out[i].FWy 	      = in[i].FWy;
     out[i].theta      = in[i].theta;
-    out[i].dophot     = in[i].dophot;
     out[i].photcode   = in[i].photcode;
-    out[i].t          = in[i].t;
-    out[i].averef     = in[i].averef;
-    out[i].flags      = in[i].flags;
-    out[i].Xccd       = in[i].Xccd;
-    out[i].Yccd       = in[i].Yccd;
     out[i].dXccd      = in[i].dXccd;
     out[i].dYccd      = in[i].dYccd;
+    out[i].dbFlags    = in[i].dbFlags;
+    out[i].photFlags  = in[i].photFlags;
     out[i].stargal    = in[i].stargal;
-    out[i].Sky        = in[i].Sky;
-    out[i].dSky       = in[i].dSky;
-    out[i].qPSF       = in[i].qPSF;
-    out[i].detID_hi   = in[i].detID_hi;
-    out[i].detID_lo   = in[i].detID_lo;
-    out[i].imageID_hi = in[i].imageID_hi;
-    out[i].imageID_lo = in[i].imageID_lo;
+    out[i].dophot     = in[i].dophot;
   }
   return (out);
@@ -221,6 +225,5 @@
     out[i].code		    = in[i].code;
     out[i].ccdnum	    = in[i].ccdnum;
-    out[i].imageID_hi	    = in[i].imageID_hi;
-    out[i].imageID_lo	    = in[i].imageID_lo;
+    out[i].imageID	    = in[i].imageID;
 
     out[i].order	    = in[i].order;
@@ -277,6 +280,5 @@
     out[i].code		    = in[i].code;
     out[i].ccdnum	    = in[i].ccdnum;
-    out[i].imageID_hi	    = in[i].imageID_hi;
-    out[i].imageID_lo	    = in[i].imageID_lo;
+    out[i].imageID	    = in[i].imageID;
 
     out[i].order	    = in[i].order;
Index: trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c	(revision 15035)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c	(revision 15038)
@@ -25,5 +25,5 @@
     out[i].t        = in[i].t;
     out[i].averef   = in[i].averef;
-    out[i].flags    = in[i].flags;
+    out[i].dbFlags  = in[i].flags;
     
     /* these can be determined if needed / desired */
@@ -34,14 +34,17 @@
 
     /* these do not have a corresponding value */
-    out[i].stargal  = 0;
-    out[i].Sky      = 0;
-    out[i].dSky     = 0;
-    out[i].qPSF     = 0;
+    out[i].az        = 0;
+    out[i].stargal   = 0;
+    out[i].Sky       = 0;
+    out[i].dSky      = 0;
+    out[i].qPSF      = 0;
+    out[i].psfProb   = 0;
+    out[i].crNsigma  = 0;
+    out[i].extNsigma = 0;
+    out[i].photFlags = 0;
 
     /* XXX add these later */
-    out[i].detID_hi = 0;
-    out[i].detID_lo = 0;
-    out[i].imageID_hi = 0;
-    out[i].imageID_lo = 0;
+    out[i].detID = 0;
+    out[i].imageID = 0;
   }
   return (out);
@@ -72,5 +75,5 @@
     out[i].t       = in[i].t;
     out[i].averef  = in[i].averef;
-    out[i].flags   = in[i].flags;
+    out[i].flags   = in[i].dbFlags;
   }
   return (out);
@@ -232,6 +235,5 @@
 
     /* XXX add these later */
-    out[i].imageID_hi = 0;
-    out[i].imageID_lo = 0;
+    out[i].imageID = 0;
   }
   return (out);
Index: trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c	(revision 15035)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c	(revision 15038)
@@ -10,28 +10,33 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].dR   = in[i].dR * 0.01;
-    out[i].dD   = in[i].dD * 0.01;
-    out[i].M    = in[i].M  * 0.001;
-    out[i].dM   = in[i].dM * 0.001;
-    out[i].Mcal = in[i].Mcal * 0.001;
-    out[i].dophot  = in[i].dophot;
+    out[i].dR        = in[i].dR * 0.01;
+    out[i].dD        = in[i].dD * 0.01;
+    out[i].M         = in[i].M  * 0.001;
+    out[i].dM        = in[i].dM * 0.001;
+    out[i].Mcal      = in[i].Mcal * 0.001;
+    out[i].dophot    = in[i].dophot;
     out[i].photcode  = in[i].source;
-    out[i].t       = in[i].t;
+    out[i].t         = in[i].t;
 
     /* flags and averef are now split */
-    out[i].averef  =  in[i].averef & 0x00ffffff;
-    out[i].flags   = (in[i].averef & 0xff000000) >> 24;
+    out[i].averef    =  in[i].averef & 0x00ffffff;
+    out[i].dbFlags   = (in[i].averef & 0xff000000) >> 24;
 
     /* these values don't exist in the Loneos format */
-    out[i].Mgal    = in[i].M;
-    out[i].dt      = 0;
-    out[i].airmass = 0;
-    out[i].FWx 	      = 0;
-    out[i].FWy 	      = 0;
-    out[i].theta      = 0;
+    out[i].Mgal     = in[i].M;
+    out[i].dt       = 0;
+    out[i].airmass  = 0;
+    out[i].az       = 0;
+    out[i].FWx 	    = 0;
+    out[i].FWy 	    = 0;
+    out[i].theta    = 0;
     out[i].stargal  = 0;
     out[i].Sky      = 0;
     out[i].dSky     = 0;
     out[i].qPSF     = 0;
+    out[i].psfProb   = 0;
+    out[i].crNsigma  = 0;
+    out[i].extNsigma = 0;
+    out[i].photFlags = 0;
 
     /* these can be determined if needed / desired */
@@ -42,8 +47,6 @@
 
     /* XXX add these later */
-    out[i].detID_hi = 0;
-    out[i].detID_lo = 0;
-    out[i].imageID_hi = 0;
-    out[i].imageID_lo = 0;
+    out[i].detID = 0;
+    out[i].imageID = 0;
   }
   return (out);
@@ -69,5 +72,5 @@
 
     /* flags and averef are merged in Loneos */
-    out[i].averef =  (in[i].averef & 0x00ffffff) | (in[i].flags << 24);
+    out[i].averef =  (in[i].averef & 0x00ffffff) | (in[i].dbFlags << 24);
   }
   return (out);
@@ -226,6 +229,5 @@
 
     /* XXX add these later */
-    out[i].imageID_hi = 0;
-    out[i].imageID_lo = 0;
+    out[i].imageID = 0;
   }
   return (out);
Index: trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 15035)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 15038)
@@ -26,5 +26,5 @@
     out[i].t          = in[i].t;
     out[i].averef     = in[i].averef;
-    out[i].flags      = in[i].flags;
+    out[i].dbFlags    = in[i].flags;
     out[i].Xccd       = in[i].Xccd;
     out[i].Yccd       = in[i].Yccd;
@@ -35,8 +35,12 @@
     out[i].dSky       = in[i].dSky;
     out[i].qPSF       = in[i].qPSF;
-    out[i].detID_hi   = in[i].detID_hi;
-    out[i].detID_lo   = in[i].detID_lo;
-    out[i].imageID_hi = in[i].imageID_hi;
-    out[i].imageID_lo = in[i].imageID_lo;
+    out[i].detID      = in[i].detID_lo;
+    out[i].imageID    = in[i].imageID_lo;
+
+    // these don't have a correspondence
+    out[i].psfProb   = 0;
+    out[i].crNsigma  = 0;
+    out[i].extNsigma = 0;
+    out[i].photFlags = 0;
   }
   return (out);
@@ -68,5 +72,5 @@
     out[i].t          = in[i].t;
     out[i].averef     = in[i].averef;
-    out[i].flags      = in[i].flags;
+    out[i].flags      = in[i].dbFlags;
     out[i].Xccd       = in[i].Xccd;
     out[i].Yccd       = in[i].Yccd;
@@ -77,8 +81,8 @@
     out[i].dSky       = in[i].dSky;
     out[i].qPSF       = in[i].qPSF;
-    out[i].detID_hi   = in[i].detID_hi;
-    out[i].detID_lo   = in[i].detID_lo;
-    out[i].imageID_hi = in[i].imageID_hi;
-    out[i].imageID_lo = in[i].imageID_lo;
+    out[i].detID_hi   = 0;
+    out[i].detID_lo   = in[i].detID;
+    out[i].imageID_hi = 0;
+    out[i].imageID_lo = in[i].imageID;
   }
   return (out);
@@ -219,6 +223,5 @@
     out[i].code		    = in[i].code;
     out[i].ccdnum	    = in[i].ccdnum;
-    out[i].imageID_hi	    = in[i].imageID_hi;
-    out[i].imageID_lo	    = in[i].imageID_lo;
+    out[i].imageID	    = in[i].imageID_lo;
 
     out[i].order	    = in[i].order;
@@ -275,6 +278,6 @@
     out[i].code		    = in[i].code;
     out[i].ccdnum	    = in[i].ccdnum;
-    out[i].imageID_hi	    = in[i].imageID_hi;
-    out[i].imageID_lo	    = in[i].imageID_lo;
+    out[i].imageID_hi	    = 0;
+    out[i].imageID_lo	    = in[i].imageID;
 
     out[i].order	    = in[i].order;
Index: trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 15035)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 15038)
@@ -26,5 +26,5 @@
     out[i].t          = in[i].t;
     out[i].averef     = in[i].averef;
-    out[i].flags      = in[i].flags;
+    out[i].dbFlags    = in[i].flags;
     out[i].Xccd       = in[i].Xccd;
     out[i].Yccd       = in[i].Yccd;
@@ -35,8 +35,12 @@
     out[i].dSky       = in[i].dSky;
     out[i].qPSF       = in[i].qPSF;
-    out[i].detID_hi   = in[i].detID_hi;
-    out[i].detID_lo   = in[i].detID_lo;
-    out[i].imageID_hi = in[i].imageID_hi;
-    out[i].imageID_lo = in[i].imageID_lo;
+    out[i].detID      = in[i].detID_lo;
+    out[i].imageID    = in[i].imageID_lo;
+
+    // these don't have a correspondence
+    out[i].psfProb   = 0;
+    out[i].crNsigma  = 0;
+    out[i].extNsigma = 0;
+    out[i].photFlags = 0;
   }
   return (out);
@@ -68,5 +72,5 @@
     out[i].t          = in[i].t;
     out[i].averef     = in[i].averef;
-    out[i].flags      = in[i].flags;
+    out[i].flags      = in[i].dbFlags;
     out[i].Xccd       = in[i].Xccd;
     out[i].Yccd       = in[i].Yccd;
@@ -77,8 +81,8 @@
     out[i].dSky       = in[i].dSky;
     out[i].qPSF       = in[i].qPSF;
-    out[i].detID_hi   = in[i].detID_hi;
-    out[i].detID_lo   = in[i].detID_lo;
-    out[i].imageID_hi = in[i].imageID_hi;
-    out[i].imageID_lo = in[i].imageID_lo;
+    out[i].detID_hi   = 0;
+    out[i].detID_lo   = in[i].detID;
+    out[i].imageID_hi = 0;
+    out[i].imageID_lo = in[i].imageID;
   }
   return (out);
@@ -219,6 +223,5 @@
     out[i].code		    = in[i].code;
     out[i].ccdnum	    = in[i].ccdnum;
-    out[i].imageID_hi	    = in[i].imageID_hi;
-    out[i].imageID_lo	    = in[i].imageID_lo;
+    out[i].imageID	    = in[i].imageID_lo;
 
     out[i].order	    = in[i].order;
@@ -275,6 +278,6 @@
     out[i].code		    = in[i].code;
     out[i].ccdnum	    = in[i].ccdnum;
-    out[i].imageID_hi	    = in[i].imageID_hi;
-    out[i].imageID_lo	    = in[i].imageID_lo;
+    out[i].imageID_hi	    = 0;
+    out[i].imageID_lo	    = in[i].imageID;
 
     out[i].order	    = in[i].order;