Index: trunk/Ohana/src/opihi/dvo/gstar.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/gstar.c	(revision 16040)
+++ trunk/Ohana/src/opihi/dvo/gstar.c	(revision 16810)
@@ -151,5 +151,5 @@
 	gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
 	gprint (GP_LOG, "%11.7f ", catalog.average[k].D);
-	gprint (GP_LOG, "%3d   ",  catalog.average[k].Nm);
+	gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
 	gprint (GP_LOG, "%4.1f ",  0.01*catalog.average[k].Xp);
 	gprint (GP_LOG, "%5d",     catalog.average[k].code);
@@ -164,6 +164,6 @@
 	    gprint (GP_LOG, "%f",     catalog.average[k].P);
 	    gprint (GP_LOG, "%f",     catalog.average[k].dP);
-	    gprint (GP_LOG, "%x",     catalog.average[k].objID_hi);
-	    gprint (GP_LOG, "%x",     catalog.average[k].objID_lo);
+	    gprint (GP_LOG, "%x",     catalog.average[k].objID);
+	    gprint (GP_LOG, "%x",     catalog.average[k].catID);
 	}
 
@@ -188,6 +188,6 @@
 
       if (GetMeasures || SaveVectors) {
-	m = catalog.average[k].offset;
-	for (j = 0; j < catalog.average[k].Nm; j++, m++) {
+	m = catalog.average[k].measureOffset;
+	for (j = 0; j < catalog.average[k].Nmeasure; j++, m++) {
 
 	  Mcat = PhotCat (&catalog.measure[m]);
@@ -209,5 +209,5 @@
 	    if (FULL_OUTPUT) {
 		gprint (GP_LOG, "%f", catalog.measure[m].Mcal);
-		gprint (GP_LOG, "%f", catalog.measure[m].Mgal);
+		gprint (GP_LOG, "%f", catalog.measure[m].Map);
 		gprint (GP_LOG, "%f", pow(10.0, 0.4*catalog.measure[m].dt));
 		gprint (GP_LOG, "%f", 1.0 + catalog.measure[m].airmass);
@@ -223,5 +223,5 @@
 		gprint (GP_LOG, "%d", catalog.measure[m].imageID);
 		gprint (GP_LOG, "%f", catalog.measure[m].qPSF);
-		gprint (GP_LOG, "%f", catalog.measure[m].psfProb);
+		gprint (GP_LOG, "%f", catalog.measure[m].psfChisq);
 		gprint (GP_LOG, "%f", catalog.measure[m].crNsigma);
 		gprint (GP_LOG, "%f", catalog.measure[m].extNsigma);