Index: trunk/Ohana/src/getstar/src/ReadImageHeader.c
===================================================================
--- trunk/Ohana/src/getstar/src/ReadImageHeader.c	(revision 16140)
+++ trunk/Ohana/src/getstar/src/ReadImageHeader.c	(revision 16810)
@@ -98,5 +98,4 @@
   image[0].Xm   = NAN_S_SHORT;
   image[0].code = 0;
-  bzero (image[0].dummy, sizeof(image[0].dummy));
 
   return (TRUE);
Index: trunk/Ohana/src/getstar/src/select_by_region.c
===================================================================
--- trunk/Ohana/src/getstar/src/select_by_region.c	(revision 16140)
+++ trunk/Ohana/src/getstar/src/select_by_region.c	(revision 16810)
@@ -54,6 +54,6 @@
 	mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
       } else {
-	offset = catalog[0].average[i].offset;
-	for (m = 0; m < catalog[0].average[i].Nm; m++) {
+	offset = catalog[0].average[i].measureOffset;
+	for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
 	  if (catalog[0].measure[offset + m].photcode == code) {
 	    mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
@@ -66,5 +66,5 @@
 
     output[0].average[Nave] = catalog[0].average[i];
-    output[0].average[Nave].offset = Nmeas;
+    output[0].average[Nave].measureOffset = Nmeas;
     for (j = 0; j < Nsecfilt; j++) {
       output[0].secfilt[Nsecfilt*Nave + j] = catalog[0].secfilt[Nsecfilt*i + j];
@@ -72,7 +72,7 @@
 
     Nm = 0;
-    offset = catalog[0].average[i].offset;
+    offset = catalog[0].average[i].measureOffset;
 
-    for (j = 0; j < catalog[0].average[i].Nm; j++) {
+    for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
       output[0].measure[Nmeas] = catalog[0].measure[offset + j];
       output[0].measure[Nmeas].averef = Nave;
Index: trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_0.c
===================================================================
--- trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_0.c	(revision 16140)
+++ trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_0.c	(revision 16810)
@@ -58,6 +58,6 @@
     } else {
       output[i].mag = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c0) {
           output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
@@ -72,6 +72,6 @@
     } else {
       output[i].c1 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c1) {
           output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
@@ -86,6 +86,6 @@
     } else {
       output[i].c2 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c2) {
           output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
Index: trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_1.c
===================================================================
--- trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_1.c	(revision 16140)
+++ trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_1.c	(revision 16810)
@@ -61,6 +61,6 @@
     } else {
       output[i].mag = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c0) {
           output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
@@ -75,6 +75,6 @@
     } else {
       output[i].c1 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c1) {
           output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
@@ -89,6 +89,6 @@
     } else {
       output[i].c2 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c2) {
           output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
Index: trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c
===================================================================
--- trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c	(revision 16140)
+++ trunk/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c	(revision 16810)
@@ -67,6 +67,6 @@
     } else {
       output[i].mag = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c0) {
           output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
@@ -81,6 +81,6 @@
     } else {
       output[i].c1 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c1) {
           output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
@@ -95,6 +95,6 @@
     } else {
       output[i].c2 = NAN;
-      offset = average[i].offset;
-      for (m = 0; m < average[i].Nm; m++) {
+      offset = average[i].measureOffset;
+      for (m = 0; m < average[i].Nmeasure; m++) {
         if (measure[offset + m].photcode == code_c2) {
           output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);