Index: trunk/Ohana/src/opihi/dvo/lightcurve.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/lightcurve.c	(revision 16810)
+++ trunk/Ohana/src/opihi/dvo/lightcurve.c	(revision 20936)
@@ -87,7 +87,7 @@
   N = 0;
   NPTS = 100;
-  REALLOCATE (tvec[0].elements, float, NPTS);
-  REALLOCATE (mvec[0].elements, float, NPTS);
-  REALLOCATE (dmvec[0].elements, float, NPTS);
+  ResetVector (tvec, OPIHI_FLT, NPTS);
+  ResetVector (mvec, OPIHI_FLT, NPTS);
+  ResetVector (dmvec, OPIHI_FLT, NPTS);
   
   GetTimeFormat (&TimeReference, &TimeFormat);
@@ -117,22 +117,22 @@
 	}      
 
-	tvec[0].elements[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
-	dmvec[0].elements[N] = catalog.measure[m].dM;
+	tvec[0].elements.Flt[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
+	dmvec[0].elements.Flt[N] = catalog.measure[m].dM;
 	if (RELPHOT) {
-	  mvec[0].elements[N] = PhotCat (&catalog.measure[m]);
+	  mvec[0].elements.Flt[N] = PhotCat (&catalog.measure[m]);
 	} else {
-	  mvec[0].elements[N] = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
+	  mvec[0].elements.Flt[N] = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
 	}
 	N++; 
 	if (N == NPTS) {
 	  NPTS += 100;
-	  REALLOCATE (tvec[0].elements, float, NPTS);
-	  REALLOCATE (mvec[0].elements, float, NPTS);
-	  REALLOCATE (dmvec[0].elements, float, NPTS);
+	  REALLOCATE (tvec[0].elements.Flt, opihi_flt, NPTS);
+	  REALLOCATE (mvec[0].elements.Flt, opihi_flt, NPTS);
+	  REALLOCATE (dmvec[0].elements.Flt, opihi_flt, NPTS);
 	}
       }      
     }
   }
-  fsortthree (tvec[0].elements, mvec[0].elements, dmvec[0].elements, N);
+  dsortthree (tvec[0].elements.Flt, mvec[0].elements.Flt, dmvec[0].elements.Flt, N);
   tvec[0].Nelements = mvec[0].Nelements = dmvec[0].Nelements = N;