Index: trunk/Ohana/src/opihi/dvo/photometry.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/photometry.c	(revision 15509)
+++ trunk/Ohana/src/opihi/dvo/photometry.c	(revision 16810)
@@ -562,5 +562,5 @@
   *nlist = 0; 
   Nlist = 0;
-  NLIST = MAX (1, average[0].Nm);
+  NLIST = MAX (1, average[0].Nmeasure);
   ALLOCATE (list, double, NLIST);
 
@@ -569,5 +569,5 @@
 
   /* look for measures */
-  for (i = 0; i < average[0].Nm; i++) {
+  for (i = 0; i < average[0].Nmeasure; i++) {
     TESTCODE (code, measure[i]);  /* skip measurements not matching photcode */
     TESTMEASURE (measure[i]);     /* exclusions based on measure.params  */
@@ -633,8 +633,8 @@
 
     case AVE_NMEAS:
-      value = average[0].Nm;
+      value = average[0].Nmeasure;
       break;
     case AVE_NMISS:
-      value = average[0].Nn;
+      value = average[0].Nmissing;
       break;
     case AVE_Xp:
@@ -658,5 +658,5 @@
 	case MAG_CAL:
 	  value = NAN;
-	  for (i = 0; i < average[0].Nm; i++) {
+	  for (i = 0; i < average[0].Nmeasure; i++) {
 	      if (code[0].code != measure[i].photcode) continue;
 	      value = measure[i].M;
@@ -679,5 +679,5 @@
     case AVE_NCODE:
       value = 0;
-      for (i = 0; i < average[0].Nm; i++) {
+      for (i = 0; i < average[0].Nmeasure; i++) {
 	if (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
 	value ++;
@@ -686,5 +686,5 @@
     case AVE_NPHOT:
       value = 0;
-      for (i = 0; i < average[0].Nm; i++) {
+      for (i = 0; i < average[0].Nmeasure; i++) {
 	if (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
 	if (measure[i].dbFlags & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
@@ -695,5 +695,5 @@
     case AVE_NCRIT:
       value = 0;
-      for (i = 0; i < average[0].Nm; i++) {
+      for (i = 0; i < average[0].Nmeasure; i++) {
 	if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].photcode))) continue;
 	if (ErrSelect && (measure[i].dM > ErrValue)) continue;
@@ -716,5 +716,5 @@
   
   Nt = Nc = 0;
-  for (k = 0; k < average[0].Nm; k++) {
+  for (k = 0; k < average[0].Nmeasure; k++) {
     if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[k].photcode))) continue;
     Nc ++;
@@ -732,5 +732,5 @@
   
   Nt[0] = Nt[1] = Nt[2] = 0;
-  for (k = 0; k < average[0].Nm; k++) {
+  for (k = 0; k < average[0].Nmeasure; k++) {
     if (code != GetPhotcodeEquivCodebyCode (measure[k].photcode)) continue;
     N = GetMeasureTypeCode (&measure[k]);
@@ -793,5 +793,5 @@
   if ((code != NULL) && (code[0].type == PHOT_REF)) {
     Nm = 0;
-    for (i = 0; i < average[0].Nm; i++) {
+    for (i = 0; i < average[0].Nmeasure; i++) {
       TESTCODE (code, measure[i]);
       Nm++;
@@ -805,5 +805,5 @@
   if (FWHMSelect) {
     Nm = 0;
-    for (i = 0; i < average[0].Nm; i++) {
+    for (i = 0; i < average[0].Nmeasure; i++) {
       fwhm = measure[i].FWx / 100.0;
       switch (FWHMsign) {
@@ -820,5 +820,5 @@
       Nm++;
     }
-    if (average[0].Nm * FWHMfrac > Nm) return (FALSE);
+    if (average[0].Nmeasure * FWHMfrac > Nm) return (FALSE);
   }
 
@@ -833,5 +833,5 @@
   if (NcodeSelect) {
     Nm = 0;
-    for (i = 0; i < average[0].Nm; i++) {
+    for (i = 0; i < average[0].Nmeasure; i++) {
       TESTCODE (code, measure[i]);
       Nm++;
@@ -872,5 +872,5 @@
   if (NphotSelect) {
     Nm = 0;
-    for (i = 0; i < average[0].Nm; i++) {
+    for (i = 0; i < average[0].Nmeasure; i++) {
       TESTCODE (code, measure[i]);
       if (measure[i].dbFlags && ID_MEAS_SKIP) continue;
@@ -931,5 +931,5 @@
    Ns    - secfilt entry (-1 for PRI)
    &catalog.average[i], 
-   &catalog.measure[catalog.average[i].offset], 
+   &catalog.measure[catalog.average[i].measureOffset], 
    &catalog.secfilt[i*Nsec] 
 */
@@ -974,5 +974,5 @@
   *nlist = 0; 
   Nlist = 0;
-  NLIST = MAX (1, average[0].Nm*average[0].Nm);
+  NLIST = MAX (1, average[0].Nmeasure*average[0].Nmeasure);
   ALLOCATE (list, double, NLIST);
   M1 = M2 = NULL;
@@ -1015,5 +1015,5 @@
   *nlist = 0; 
   Nlist = 0;
-  NLIST = MAX (1, average[0].Nm*average[0].Nm);
+  NLIST = MAX (1, average[0].Nmeasure*average[0].Nmeasure);
   ALLOCATE (list, double, NLIST);
 
@@ -1031,10 +1031,10 @@
 
   /* loop twice over all measures */
-  for (i = 0; i < average[0].Nm; i++) {
+  for (i = 0; i < average[0].Nmeasure; i++) {
     SetSelectionParam (Np0);
     TESTCODE (code[0], measure[i]);
     TESTMEASURE (measure[i]);
     SETMAG(M1, measure[i], mode[0]);
-    for (j = 0; j < average[0].Nm; j++) {
+    for (j = 0; j < average[0].Nmeasure; j++) {
       if (i == j) continue;
       SetSelectionParam (Np1);
@@ -1086,5 +1086,5 @@
   *nlist = 0; 
   Nlist = 0;
-  NLIST = MAX (1, average[0].Nm*average[0].Nm);
+  NLIST = MAX (1, average[0].Nmeasure*average[0].Nmeasure);
   ALLOCATE (list, double, NLIST);
 
@@ -1099,9 +1099,9 @@
 
   /* loop twice over all measures */
-  for (i = 0; i < average[0].Nm; i++) {
+  for (i = 0; i < average[0].Nmeasure; i++) {
     TESTCODE (code[0], measure[i]);
     TESTMEASURE (measure[i]);
     SETMAG(M1, measure[i], mode[0]);
-    for (j = 0; j < average[0].Nm; j++) {
+    for (j = 0; j < average[0].Nmeasure; j++) {
       if (i == j) continue;
       TESTCODE (code[1], measure[j]);