Index: trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c	(revision 15510)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c	(revision 15511)
@@ -10,12 +10,12 @@
 
   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].dt       = in[i].dt * 0.001;
-    out[i].Mcal     = in[i].Mcal * 0.001;
-    out[i].Mgal     = in[i].Mgal * 0.001;
-    out[i].airmass  = in[i].airmass * 0.001;
+    out[i].dR       = (in[i].dR      == NAN_S_SHORT) ? NAN : in[i].dR     * 0.01;
+    out[i].dD       = (in[i].dD      == NAN_S_SHORT) ? NAN : in[i].dD     * 0.01;
+    out[i].M        = (in[i].M       == NAN_S_SHORT) ? NAN : in[i].M      * 0.001;
+    out[i].dM       = (in[i].dM      == NAN_U_CHAR)  ? NAN : in[i].dM     * 0.001;
+    out[i].dt       = (in[i].dt      == NAN_S_SHORT) ? NAN : in[i].dt     * 0.001;
+    out[i].Mcal     = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
+    out[i].Mgal     = (in[i].Mgal    == NAN_S_SHORT) ? NAN : in[i].Mgal   * 0.001;
+    out[i].airmass  = (in[i].airmass == NAN_S_SHORT) ? NAN : in[i].airmass* 0.001;
     out[i].FWx 	    = in[i].FWx;
     out[i].FWy 	    = in[i].fwy * in[i].FWx * 0.01;
@@ -60,15 +60,17 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].dR      = in[i].dR * 100.0;
-    out[i].dD 	   = in[i].dD * 100.0;
-    out[i].M       = in[i].M  * 1000.0;
+    out[i].dR       = isnan(in[i].dR     ) ? NAN_S_SHORT : in[i].dR      *  100.0;
+    out[i].dD       = isnan(in[i].dD     ) ? NAN_S_SHORT : in[i].dD      *  100.0;
+    out[i].M        = isnan(in[i].M      ) ? NAN_S_SHORT : in[i].M       * 1000.0;
+    out[i].dM       = isnan(in[i].dM     ) ? NAN_U_CHAR  : in[i].dM      * 1000.0;
+    out[i].dt       = isnan(in[i].dt     ) ? NAN_S_SHORT : in[i].dt      * 1000.0;
+    out[i].Mcal     = isnan(in[i].Mcal   ) ? NAN_S_SHORT : in[i].Mcal    * 1000.0;
+    out[i].Mgal     = isnan(in[i].Mgal   ) ? NAN_S_SHORT : in[i].Mgal    * 1000.0;
+    out[i].airmass  = isnan(in[i].airmass) ? NAN_S_SHORT : in[i].airmass * 1000.0;
+
     if (out[i].M < 0) {
 	fprintf (stderr, ".");
     }
-    out[i].dM      = in[i].dM * 1000.0;
-    out[i].dt      = in[i].dt * 1000.0;
-    out[i].Mcal    = in[i].Mcal * 1000.0;
-    out[i].Mgal    = in[i].Mgal * 1000.0;
-    out[i].airmass = in[i].airmass * 1000.0;
+
     out[i].FWx 	   = in[i].FWx;
     out[i].fwy 	   = in[i].FWy * 100.0 / in[i].FWx;
@@ -116,12 +118,9 @@
     out[i].objID_lo = 0;
 
-    primary[0][i].M  = in[i].M  * 0.001;      
-    primary[0][i].dM = in[i].dM * 0.001;      
-    primary[0][i].Xm = in[i].Xm;     
+    primary[0][i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;      
+    primary[0][i].dM    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM * 0.001;      
+    primary[0][i].Xm    = in[i].Xm;     
     primary[0][i].Ncode = 0;     
     primary[0][i].Nused = 0;
-
-    // XXX drop this or keep this?
-    // primary[0][i].Xg = in[i].Xg;
   }
   return (out);
@@ -146,8 +145,7 @@
     out[i].missing = in[i].missing;
 
-    out[i].M       = primary[i].M  * 1000.0;      
-    out[i].dM      = primary[i].dM * 1000.0;
+    out[i].M       = isnan(primary[i].M)  ? NAN_S_SHORT : primary[i].M   * 1000.0;
+    out[i].dM      = isnan(primary[i].dM) ? NAN_S_SHORT : primary[i].dM  * 1000.0;
     out[i].Xm      = primary[i].Xm;     
-    // out[i].Xg      = in[i].Xg;
   }
   return (out);
@@ -163,6 +161,6 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M  * 0.001;      
-    out[i].dM    = in[i].dM * 0.001;      
+    out[i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M   * 0.001;
+    out[i].dM    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM  * 0.001;
     out[i].Xm    = in[i].Xm;     
     out[i].Ncode = 0;
@@ -181,7 +179,7 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M       = in[i].M  * 1000.0;      
-    out[i].dM      = in[i].dM * 1000.0;
-    out[i].Xm      = in[i].Xm;     
+    out[i].M     = isnan(in[i].M)  ? NAN_S_SHORT : in[i].M   * 1000.0;
+    out[i].dM    = isnan(in[i].dM) ? NAN_S_SHORT : in[i].dM  * 1000.0;
+    out[i].Xm    = in[i].Xm;     
   }
   return (out);
@@ -198,16 +196,15 @@
   for (i = 0; i < Nvalues; i++) {
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
-    memcpy (out[i].dummy, in[i].dummy, 20);
-    strcpy (out[i].name, in[i].name);
+    strcpy (out[i].name, in[i].name); // out[64], in[32]
 
     out[i].tzero    	    = in[i].tzero;
     out[i].nstar    	    = in[i].nstar;
-    out[i].secz    	    = in[i].secz * 0.001;
     out[i].NX	    	    = in[i].NX;
     out[i].NY	    	    = in[i].NY;
-    out[i].apmifit  	    = in[i].apmifit * 0.001;
-    out[i].dapmifit 	    = in[i].dapmifit * 0.001;
-    out[i].Mcal   	    = in[i].Mcal * 0.001;
-    out[i].dMcal   	    = in[i].dMcal * 0.001;
+    out[i].secz    	    = (in[i].secz     == NAN_S_SHORT) ? NAN : in[i].secz     * 0.001;
+    out[i].apmifit  	    = (in[i].apmifit  == NAN_S_SHORT) ? NAN : in[i].apmifit  * 0.001;
+    out[i].dapmifit  	    = (in[i].dapmifit == NAN_S_SHORT) ? NAN : in[i].dapmifit * 0.001;
+    out[i].Mcal   	    = (in[i].Mcal     == NAN_S_SHORT) ? NAN : in[i].Mcal     * 0.001;
+    out[i].dMcal   	    = (in[i].dMcal    == NAN_S_SHORT) ? NAN : in[i].dMcal    * 0.001;
     out[i].Xm	    	    = in[i].Xm;
     out[i].photcode   	    = in[i].source;
@@ -221,4 +218,5 @@
     out[i].code		    = in[i].code;
     out[i].ccdnum	    = in[i].ccdnum;
+
     out[i].order	    = in[i].order;
     out[i].Mx		    = in[i].Mx;
@@ -239,4 +237,8 @@
     /* XXX add these later */
     out[i].imageID = 0;
+
+    // not available in ELIXIR
+    out[i].sidtime  	    = NAN;
+    out[i].latitude  	    = NAN;
   }
   return (out);
@@ -253,16 +255,16 @@
   for (i = 0; i < Nvalues; i++) {
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
-    memcpy (out[i].dummy, in[i].dummy, 20);
-    strcpy (out[i].name, in[i].name);
+    strncpy (out[i].name, in[i].name, 31); // out[32], in[64]
+    out[i].name[31] = 0; // force termination
 
     out[i].tzero    	    = in[i].tzero;
     out[i].nstar    	    = in[i].nstar;
-    out[i].secz	    	    = in[i].secz * 1000.0;
     out[i].NX	    	    = in[i].NX;
     out[i].NY	    	    = in[i].NY;
-    out[i].apmifit  	    = in[i].apmifit * 1000.0;
-    out[i].dapmifit 	    = in[i].dapmifit * 1000.0;
-    out[i].Mcal	    	    = in[i].Mcal * 1000.0;
-    out[i].dMcal    	    = in[i].dMcal * 1000.0;
+    out[i].secz    	    = isnan(in[i].secz    ) ? NAN_S_SHORT : in[i].secz     * 1000.0;
+    out[i].apmifit    	    = isnan(in[i].apmifit ) ? NAN_S_SHORT : in[i].apmifit  * 1000.0;
+    out[i].dapmifit    	    = isnan(in[i].dapmifit) ? NAN_S_SHORT : in[i].dapmifit * 1000.0;
+    out[i].Mcal    	    = isnan(in[i].Mcal    ) ? NAN_S_SHORT : in[i].Mcal     * 1000.0;
+    out[i].dMcal    	    = isnan(in[i].dMcal   ) ? NAN_S_SHORT : in[i].dMcal    * 1000.0;
     out[i].Xm	    	    = in[i].Xm;
     out[i].source   	    = in[i].photcode;
@@ -276,4 +278,5 @@
     out[i].code		    = in[i].code;
     out[i].ccdnum	    = in[i].ccdnum;
+
     out[i].order	    = in[i].order;
     out[i].Mx		    = in[i].Mx;
Index: trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c	(revision 15510)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c	(revision 15511)
@@ -10,9 +10,9 @@
 
   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].dR        = (in[i].dR      == NAN_S_SHORT) ? NAN : in[i].dR     * 0.01;
+    out[i].dD        = (in[i].dD      == NAN_S_SHORT) ? NAN : in[i].dD     * 0.01;
+    out[i].M         = (in[i].M       == NAN_S_SHORT) ? NAN : in[i].M      * 0.001;
+    out[i].dM        = (in[i].dM      == NAN_U_CHAR)  ? NAN : in[i].dM     * 0.001;
+    out[i].Mcal      = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
     out[i].dophot    = in[i].dophot;
     out[i].photcode  = in[i].source;
@@ -24,5 +24,5 @@
 
     /* these values don't exist in the Loneos format */
-    out[i].Mgal     = in[i].M;
+    out[i].Mgal     = out[i].M;
     out[i].dt       = 0;
     out[i].airmass  = 0;
@@ -62,9 +62,9 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].dR 	  = in[i].dR * 100.0;
-    out[i].dD 	  = in[i].dD * 100.0;
-    out[i].M  	  = in[i].M  * 1000.0;
-    out[i].dM 	  = in[i].dM * 1000.0;
-    out[i].Mcal   = in[i].Mcal * 1000.0;
+    out[i].dR     = isnan(in[i].dR     ) ? NAN_S_SHORT : in[i].dR      *  100.0;
+    out[i].dD     = isnan(in[i].dD     ) ? NAN_S_SHORT : in[i].dD      *  100.0;
+    out[i].M      = isnan(in[i].M      ) ? NAN_S_SHORT : in[i].M       * 1000.0;
+    out[i].dM     = isnan(in[i].dM     ) ? NAN_U_CHAR  : in[i].dM      * 1000.0;
+    out[i].Mcal   = isnan(in[i].Mcal   ) ? NAN_S_SHORT : in[i].Mcal    * 1000.0;
     out[i].dophot = in[i].dophot;
     out[i].source = in[i].photcode;
@@ -110,12 +110,9 @@
     out[i].objID_lo = 0;
 
-    primary[0][i].M  = in[i].M  * 0.001;      
+    primary[0][i].M  = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;      
     primary[0][i].Xm = in[i].Xm;     
-    primary[0][i].dM = 0xffff;
+    primary[0][i].dM = NAN;
     primary[0][i].Ncode = 0;     
     primary[0][i].Nused = 0;
-
-    // XXX drop this or keep this?
-    // primary[0][i].Xg = in[i].Xg;
   }
   return (out);
@@ -140,5 +137,5 @@
     out[i].missing = in[i].missing;
 
-    out[i].M       = primary[i].M * 1000.0;      
+    out[i].M       = isnan(primary[i].M)  ? NAN_S_SHORT : primary[i].M   * 1000.0;
     out[i].Xm      = primary[i].Xm;     
   }
@@ -155,7 +152,7 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M*0.001;      
+    out[i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M * 0.001;
     out[i].Xm    = in[i].Xm;      
-    out[i].dM    = 0xffff;
+    out[i].dM    = NAN;
     out[i].Ncode = 0;
     out[i].Nused = 0;
@@ -173,5 +170,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M    = in[i].M*1000.0;      
+    out[i].M    = isnan(in[i].M)  ? NAN_S_SHORT : in[i].M * 1000.0;
     out[i].Xm   = in[i].Xm;      
   }
@@ -189,16 +186,17 @@
   for (i = 0; i < Nvalues; i++) {
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
-    memcpy (out[i].dummy, in[i].dummy, 20);
-    strcpy (out[i].name, in[i].name);
+    strcpy (out[i].name, in[i].name); // out[64], in[32]
 
     out[i].tzero    	    = in[i].tzero;
     out[i].nstar    	    = in[i].nstar;
-    out[i].secz    	    = in[i].secz * 0.001;
     out[i].NX	    	    = in[i].NX;
     out[i].NY	    	    = in[i].NY;
-    out[i].apmifit  	    = in[i].apmifit * 0.001;
-    out[i].dapmifit 	    = in[i].dapmifit * 0.001;
-    out[i].Mcal	    = in[i].Mcal * 0.001;
-    out[i].dMcal    	    = in[i].dMcal * 0.001;
+
+    out[i].secz    	    = (in[i].secz     == NAN_S_SHORT) ? NAN : in[i].secz     * 0.001;
+    out[i].apmifit  	    = (in[i].apmifit  == NAN_S_SHORT) ? NAN : in[i].apmifit  * 0.001;
+    out[i].dapmifit  	    = (in[i].dapmifit == NAN_S_SHORT) ? NAN : in[i].dapmifit * 0.001;
+    out[i].Mcal   	    = (in[i].Mcal     == NAN_S_SHORT) ? NAN : in[i].Mcal     * 0.001;
+    out[i].dMcal   	    = (in[i].dMcal    == NAN_S_SHORT) ? NAN : in[i].dMcal    * 0.001;
+
     out[i].Xm	    	    = in[i].Xm;
     out[i].photcode   	    = in[i].source;
@@ -244,16 +242,18 @@
   for (i = 0; i < Nvalues; i++) {
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
-    memcpy (out[i].dummy, in[i].dummy, 20);
-    strcpy (out[i].name, in[i].name);
+    strncpy (out[i].name, in[i].name, 31); // out[32], in[64]
+    out[i].name[31] = 0; // force termination
 
     out[i].tzero    	    = in[i].tzero;
     out[i].nstar    	    = in[i].nstar;
-    out[i].secz	    	    = in[i].secz * 1000.0;
     out[i].NX	    	    = in[i].NX;
     out[i].NY	    	    = in[i].NY;
-    out[i].apmifit  	    = in[i].apmifit * 1000.0;
-    out[i].dapmifit 	    = in[i].dapmifit * 1000.0;
-    out[i].Mcal	    	    = in[i].Mcal * 1000.0;
-    out[i].dMcal    	    = in[i].dMcal * 1000.0;
+
+    out[i].secz    	    = isnan(in[i].secz    ) ? NAN_S_SHORT : in[i].secz     * 1000.0;
+    out[i].apmifit    	    = isnan(in[i].apmifit ) ? NAN_S_SHORT : in[i].apmifit  * 1000.0;
+    out[i].dapmifit    	    = isnan(in[i].dapmifit) ? NAN_S_SHORT : in[i].dapmifit * 1000.0;
+    out[i].Mcal    	    = isnan(in[i].Mcal    ) ? NAN_S_SHORT : in[i].Mcal     * 1000.0;
+    out[i].dMcal    	    = isnan(in[i].dMcal   ) ? NAN_S_SHORT : in[i].dMcal    * 1000.0;
+
     out[i].Xm	    	    = in[i].Xm;
     out[i].source   	    = in[i].photcode;
Index: trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 15510)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 15511)
@@ -34,5 +34,5 @@
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;
-    out[i].qPSF       = in[i].qPSF;
+    out[i].qPSF       = (in[i].qPSF == NAN_S_SHORT) ? NAN : in[i].qPSF;
     out[i].detID      = in[i].detID_lo;
     out[i].imageID    = in[i].imageID_lo;
@@ -80,5 +80,5 @@
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;
-    out[i].qPSF       = in[i].qPSF;
+    out[i].qPSF       = isnan(in[i].qPSF) ? NAN_S_SHORT : in[i].qPSF;
     out[i].detID_hi   = 0;
     out[i].detID_lo   = in[i].detID;
@@ -199,5 +199,5 @@
   for (i = 0; i < Nvalues; i++) {
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
-    strcpy (out[i].name, in[i].name);
+    strcpy (out[i].name, in[i].name); // out[64], in[32]
 
     out[i].tzero    	    = in[i].tzero;
@@ -254,5 +254,6 @@
   for (i = 0; i < Nvalues; i++) {
     memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
-    strcpy (out[i].name, in[i].name);
+    strncpy (out[i].name, in[i].name, 31); // out[32], in[64]
+    out[i].name[31] = 0; // force termination
 
     out[i].tzero    	    = in[i].tzero;
Index: trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 15510)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 15511)
@@ -34,5 +34,5 @@
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;
-    out[i].qPSF       = in[i].qPSF;
+    out[i].qPSF       = (in[i].qPSF == NAN_S_SHORT) ? NAN : in[i].qPSF;
     out[i].detID      = in[i].detID_lo;
     out[i].imageID    = in[i].imageID_lo;
@@ -80,5 +80,5 @@
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;
-    out[i].qPSF       = in[i].qPSF;
+    out[i].qPSF       = isnan(in[i].qPSF) ? NAN_S_SHORT : in[i].qPSF;
     out[i].detID_hi   = 0;
     out[i].detID_lo   = in[i].detID;