Index: trunk/Ohana/src/relphot/src/ImageOps.c
===================================================================
--- trunk/Ohana/src/relphot/src/ImageOps.c	(revision 16140)
+++ trunk/Ohana/src/relphot/src/ImageOps.c	(revision 16810)
@@ -24,6 +24,6 @@
 
   for (i = 0; i < Nimage; i++) {
-    start[i] = image[i].tzero - MAX(0.05*image[i].trate*image[i].NY, 1);
-    stop[i]  = image[i].tzero + MAX(1.05*image[i].trate*image[i].NY, 1);
+    start[i] = image[i].tzero - MAX(0.01*image[i].trate*image[i].NY, 1);
+    stop[i]  = image[i].tzero + MAX(1.01*image[i].trate*image[i].NY, 1);
   }
 }
Index: trunk/Ohana/src/relphot/src/MosaicOps.c
===================================================================
--- trunk/Ohana/src/relphot/src/MosaicOps.c	(revision 16140)
+++ trunk/Ohana/src/relphot/src/MosaicOps.c	(revision 16810)
@@ -41,6 +41,6 @@
 
     /* set image time range */
-    start = image[i].tzero - MAX(0.05*image[i].trate*image[i].NY, 1);
-    stop  = image[i].tzero + MAX(1.05*image[i].trate*image[i].NY, 1);
+    start = image[i].tzero - MAX(0.01*image[i].trate*image[i].NY, 1);
+    stop  = image[i].tzero + MAX(1.01*image[i].trate*image[i].NY, 1);
 
     /* find existing mosaic with this time range */
Index: trunk/Ohana/src/relphot/src/StarOps.c
===================================================================
--- trunk/Ohana/src/relphot/src/StarOps.c	(revision 16140)
+++ trunk/Ohana/src/relphot/src/StarOps.c	(revision 16810)
@@ -12,5 +12,5 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      Nmax = MAX (Nmax, catalog[i].average[j].Nm);
+      Nmax = MAX (Nmax, catalog[i].average[j].Nmeasure);
     }
   }
@@ -43,8 +43,8 @@
       /* calculate the average value for a single star */
       if (catalog[i].average[j].code & STAR_BAD) continue;  
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
 
       N = 0;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 	if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
 	// XXX allow REF stars (no Image Entry) to be included in the calculation this
@@ -94,5 +94,5 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      Nmax = MAX (Nmax, catalog[i].average[j].Nm);
+      Nmax = MAX (Nmax, catalog[i].average[j].Nmeasure);
     }
   }
@@ -107,6 +107,6 @@
 
       N = 0;
-      m = catalog[i].average[j].offset;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      m = catalog[i].average[j].measureOffset;
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 	if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
 	// XXX allow REF stars (no Image Entry) to be included in the calculation this
@@ -158,6 +158,6 @@
     for (j = 0; j < catalog[i].Naverage; j++) {
 
-      m = catalog[i].average[j].offset;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      m = catalog[i].average[j].measureOffset;
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 	if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
 	Mcal  = getMcal  (m, i);
@@ -247,5 +247,5 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      Nmax = MAX (Nmax, catalog[i].average[j].Nm);
+      Nmax = MAX (Nmax, catalog[i].average[j].Nmeasure);
     }
   }
@@ -270,7 +270,7 @@
 
       /* accumulate list of valid measurements */
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
       N = 0;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 	/* if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue; */
 	Mcal  = getMcal  (m, i);
@@ -305,7 +305,7 @@
       image_bad = IMAGE_BAD;
       IMAGE_BAD = ID_IMAGE_NOCAL;
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
       N = 0;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 	/* if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue; */
 	Mcal  = getMcal  (m, i);
@@ -362,8 +362,8 @@
       /* calculate the average value for a single star */
       if (catalog[i].average[j].code & STAR_BAD) continue;  
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
 
       N = 0;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 	Mcal = getMcal  (m, i);
 	if (isnan(Mcal)) continue;
Index: trunk/Ohana/src/relphot/src/bcatalog.c
===================================================================
--- trunk/Ohana/src/relphot/src/bcatalog.c	(revision 16140)
+++ trunk/Ohana/src/relphot/src/bcatalog.c	(revision 16810)
@@ -22,9 +22,9 @@
   /* exclude stars not in range or with too few measurements */
   for (i = 0; i < catalog[0].Naverage; i++) {
-    // if (catalog[0].average[i].Nm < 2) continue; 
+    // if (catalog[0].average[i].Nmeasure < 2) continue; 
 
     /* start with all stars good */
     subcatalog[0].average[Naverage] = catalog[0].average[i];
-    subcatalog[0].average[Naverage].offset = Nmeasure;
+    subcatalog[0].average[Naverage].measureOffset = Nmeasure;
     for (j = 0; j < PhotNsec; j++) {
       subcatalog[0].secfilt[PhotNsec*Naverage+j] = catalog[0].secfilt[PhotNsec*i+j];
@@ -39,7 +39,7 @@
 
     Nm = 0;
-    for (j = 0; j < catalog[0].average[i].Nm; j++) {
+    for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
 
-      offset = catalog[0].average[i].offset + j;
+      offset = catalog[0].average[i].measureOffset + j;
 
       /* select measurements by photcode */
@@ -96,5 +96,5 @@
     }
     # endif
-    subcatalog[0].average[Naverage].Nm = Nm;
+    subcatalog[0].average[Naverage].Nmeasure = Nm;
     Naverage ++;
     if (Naverage == NAVERAGE) {
Index: trunk/Ohana/src/relphot/src/plot_scatter.c
===================================================================
--- trunk/Ohana/src/relphot/src/plot_scatter.c	(revision 16140)
+++ trunk/Ohana/src/relphot/src/plot_scatter.c	(revision 16810)
@@ -11,5 +11,5 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      Ntot += catalog[i].average[j].Nm;
+      Ntot += catalog[i].average[j].Nmeasure;
     }
   }
@@ -24,7 +24,7 @@
       /* calculate the average value for a single star */
       if (catalog[i].average[j].code & STAR_BAD) continue;  
-      m = catalog[i].average[j].offset;
+      m = catalog[i].average[j].measureOffset;
 
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 	if (catalog[i].measure[m].dbFlags & MEAS_BAD) continue;
 	Mcal = getMcal  (m, i);
Index: trunk/Ohana/src/relphot/src/setExclusions.c
===================================================================
--- trunk/Ohana/src/relphot/src/setExclusions.c	(revision 16140)
+++ trunk/Ohana/src/relphot/src/setExclusions.c	(revision 16810)
@@ -10,6 +10,6 @@
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {
-      m = catalog[i].average[j].offset;
-      for (k = 0; k < catalog[i].average[j].Nm; k++, m++) {
+      m = catalog[i].average[j].measureOffset;
+      for (k = 0; k < catalog[i].average[j].Nmeasure; k++, m++) {
 
 	/* select measurements by photcode */
Index: trunk/Ohana/src/relphot/src/setMrelFinal.c
===================================================================
--- trunk/Ohana/src/relphot/src/setMrelFinal.c	(revision 16140)
+++ trunk/Ohana/src/relphot/src/setMrelFinal.c	(revision 16810)
@@ -13,6 +13,6 @@
       catalog[0].secfilt[PhotNsec*i+PhotSec].Xm = NAN_S_SHORT;
 
-      m = catalog[0].average[i].offset;
-      for (j = 0; j < catalog[0].average[i].Nm; j++, m++) {
+      m = catalog[0].average[i].measureOffset;
+      for (j = 0; j < catalog[0].average[i].Nmeasure; j++, m++) {
 	
 	/* select measurements by photcode */
@@ -56,6 +56,6 @@
     catalog[0].average[i].code &= ~ID_STAR_FEW;
     catalog[0].average[i].code &= ~ID_STAR_POOR;
-    m = catalog[0].average[i].offset;
-    for (j = 0; j < catalog[0].average[i].Nm; j++, m++) {
+    m = catalog[0].average[i].measureOffset;
+    for (j = 0; j < catalog[0].average[i].Nmeasure; j++, m++) {
       catalog[0].measure[m].dbFlags &= ~ID_MEAS_NOCAL;
     }
@@ -80,9 +80,9 @@
   /* mark measures which should be ignored on second pass */
   for (i = 0; i < catalog[0].Naverage; i++) {
-    Ntot += catalog[0].average[i].Nm;
+    Ntot += catalog[0].average[i].Nmeasure;
     if (catalog[0].found[i]) continue;
 
-    m = catalog[0].average[i].offset;
-    for (k = 0; k < catalog[0].average[i].Nm; k++, m++) {
+    m = catalog[0].average[i].measureOffset;
+    for (k = 0; k < catalog[0].average[i].Nmeasure; k++, m++) {
       Ntry++;