Index: /branches/eam_branches/ipp-20130307/Ohana/src/addstar/src/load2mass_catalog.c
===================================================================
--- /branches/eam_branches/ipp-20130307/Ohana/src/addstar/src/load2mass_catalog.c	(revision 35344)
+++ /branches/eam_branches/ipp-20130307/Ohana/src/addstar/src/load2mass_catalog.c	(revision 35345)
@@ -20,31 +20,11 @@
     // XXX for now, the output objects will have limited astrometric interpretation...
     // XXX every 3 stars represents 3 measurements and 1 average
+    dvo_average_init (&catalog[0].average[Nave]);
     catalog[0].average[Nave].R     = stars[i].average.R;
     catalog[0].average[Nave].D     = stars[i].average.D;
-    catalog[0].average[Nave].dR    = 0;
-    catalog[0].average[Nave].dD    = 0;
-    catalog[0].average[Nave].uR    = 0;
-    catalog[0].average[Nave].uD    = 0;
-    catalog[0].average[Nave].duR   = 0;
-    catalog[0].average[Nave].duD   = 0;
-    catalog[0].average[Nave].P     = 0;
-    catalog[0].average[Nave].dP    = 0;
-
-    // XXX for now, set the average mag data to NULL
-    catalog[0].average[Nave].Nmeasure  	   = 0;
-    catalog[0].average[Nave].Nmissing  	   = 0;
-    catalog[0].average[Nave].ChiSqAve  	   = NAN_S_SHORT;
     catalog[0].average[Nave].measureOffset = Nmeas;
-    catalog[0].average[Nave].missingOffset = -1;
-    catalog[0].average[Nave].flags         = 0;
 
     for (j = 0; j < Nsec; j++) {
-      catalog[0].secfilt[Nave*Nsec+j].M     = NAN;
-      catalog[0].secfilt[Nave*Nsec+j].dM    = NAN;
-      catalog[0].secfilt[Nave*Nsec+j].Xm    = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsec+j].M_20  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsec+j].M_80  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsec+j].Ncode = 0;
-      catalog[0].secfilt[Nave*Nsec+j].Nused = 0;
+      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsec+j]);
     }