Index: /trunk/Ohana/src/opihi/dvo/dbExtractAverages.c
===================================================================
--- /trunk/Ohana/src/opihi/dvo/dbExtractAverages.c	(revision 17200)
+++ /trunk/Ohana/src/opihi/dvo/dbExtractAverages.c	(revision 17201)
@@ -197,5 +197,5 @@
       for (i = 0; i < average[0].Nm; i++) {
 	if (field->photcode->code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
-	if (measure[i].flags & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
+	if (measure[i].flags & (ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM)) continue;
 	value ++;
       }
Index: /trunk/Ohana/src/opihi/dvo/extract.c
===================================================================
--- /trunk/Ohana/src/opihi/dvo/extract.c	(revision 17200)
+++ /trunk/Ohana/src/opihi/dvo/extract.c	(revision 17201)
@@ -357,5 +357,5 @@
 	  for (k = 0; k < catalog.average[i].Nm; k++, m++) {
 	    if (code[0].code != GetPhotcodeEquivCodebyCode (catalog.measure[m].photcode)) continue;
-	    if (catalog.measure[m].photcode & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
+	    if (catalog.measure[m].photcode & (ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM)) continue;
 	    Ncode ++;
 	  }
Index: /trunk/Ohana/src/relphot/src/ImageOps.c
===================================================================
--- /trunk/Ohana/src/relphot/src/ImageOps.c	(revision 17200)
+++ /trunk/Ohana/src/relphot/src/ImageOps.c	(revision 17201)
@@ -239,5 +239,5 @@
     IMAGE_BAD = ID_IMAGE_POOR | ID_IMAGE_FEW | ID_IMAGE_SKIP;
     STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
-    MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR | ID_MEAS_SKIP | ID_MEAS_AREA;
+    MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
   }
   return;
Index: /trunk/Ohana/src/relphot/src/MosaicOps.c
===================================================================
--- /trunk/Ohana/src/relphot/src/MosaicOps.c	(revision 17200)
+++ /trunk/Ohana/src/relphot/src/MosaicOps.c	(revision 17201)
@@ -389,5 +389,5 @@
     IMAGE_BAD = ID_IMAGE_POOR | ID_IMAGE_FEW | ID_IMAGE_SKIP;
     STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
-    MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR | ID_MEAS_SKIP | ID_MEAS_AREA;
+    MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
   }
   return (TRUE);
Index: /trunk/Ohana/src/relphot/src/StarOps.c
===================================================================
--- /trunk/Ohana/src/relphot/src/StarOps.c	(revision 17200)
+++ /trunk/Ohana/src/relphot/src/StarOps.c	(revision 17201)
@@ -328,5 +328,5 @@
       for (k = 0; k < N; k++) {
 	if (fabs (list[k] - stats.median) > Ns*stats.sigma) {
-	  catalog[i].measure[ilist[k]].dbFlags |= ID_MEAS_POOR;
+	  catalog[i].measure[ilist[k]].dbFlags |= ID_MEAS_POOR_PHOTOM;
 	  Ndel ++;
 	}
Index: /trunk/Ohana/src/relphot/src/bcatalog.c
===================================================================
--- /trunk/Ohana/src/relphot/src/bcatalog.c	(revision 17200)
+++ /trunk/Ohana/src/relphot/src/bcatalog.c	(revision 17201)
@@ -71,5 +71,5 @@
       }
 
-      subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_SKIP;
+      subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
       subcatalog[0].measure[Nmeasure]        = catalog[0].measure[offset];
       subcatalog[0].measure[Nmeasure].averef = Naverage;
@@ -77,5 +77,5 @@
 	subcatalog[0].measure[Nmeasure].Mcal = 0;
 	subcatalog[0].measure[Nmeasure].dbFlags &= 0xff00;
-	subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_POOR;
+	subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_POOR_PHOTOM;
 	subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_AREA;
 	subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_NOCAL;
Index: /trunk/Ohana/src/relphot/src/initialize.c
===================================================================
--- /trunk/Ohana/src/relphot/src/initialize.c	(revision 17200)
+++ /trunk/Ohana/src/relphot/src/initialize.c	(revision 17201)
@@ -25,5 +25,5 @@
   IMAGE_BAD = ID_IMAGE_POOR | ID_IMAGE_FEW | ID_IMAGE_SKIP;
   STAR_BAD  = ID_STAR_POOR | ID_STAR_FEW;
-  MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR | ID_MEAS_SKIP | ID_MEAS_AREA;
+  MEAS_BAD  = ID_MEAS_NOCAL | ID_MEAS_POOR_PHOTOM | ID_MEAS_SKIP_PHOTOM | ID_MEAS_AREA;
 
   if (SHOW_PARAMS) {
Index: /trunk/Ohana/src/relphot/src/setMrelFinal.c
===================================================================
--- /trunk/Ohana/src/relphot/src/setMrelFinal.c	(revision 17200)
+++ /trunk/Ohana/src/relphot/src/setMrelFinal.c	(revision 17201)
@@ -28,6 +28,6 @@
 	catalog[0].measure[m].Mcal = 0;
 	catalog[0].measure[m].dbFlags &= 0xff00;
-	catalog[0].measure[m].dbFlags &= ~ID_MEAS_POOR;
-	catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP;
+	catalog[0].measure[m].dbFlags &= ~ID_MEAS_POOR_PHOTOM;
+	catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
 	catalog[0].measure[m].dbFlags &= ~ID_MEAS_AREA;
 	catalog[0].measure[m].dbFlags &= ~ID_MEAS_NOCAL;
@@ -47,5 +47,5 @@
     skip_measurements (catalog, i);       /* set ID_MEAS_SKIP for measures to be skipped */
     setMrelOutput  (catalog, 1, FALSE);   /* set Mrel using all measures not skipped */
-    clean_measures (catalog, 1, TRUE);    /* mark outliers ID_MEAS_POOR */
+    clean_measures (catalog, 1, TRUE);    /* mark outliers ID_MEAS_POOR_PHOTOM */
     setMrelOutput  (catalog, 1, TRUE);    /* set Mrel using remaining measures */
   }
@@ -76,5 +76,5 @@
   
   /* allow measures marked as outliers (POOR) and off image region (AREA) */
-  if (pass >= 3) MEAS_BAD = ID_MEAS_NOCAL | ID_MEAS_SKIP;
+  if (pass >= 3) MEAS_BAD = ID_MEAS_NOCAL | ID_MEAS_SKIP_PHOTOM;
 
   /* mark measures which should be ignored on second pass */
@@ -88,5 +88,5 @@
 
       /* clear SKIP for all measures at first */
-      catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP;
+      catalog[0].measure[m].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
 
       /** never use these measurements (wrong photcode, bad time range) */
@@ -129,5 +129,5 @@
 
     skip:
-      catalog[0].measure[m].dbFlags |= ID_MEAS_SKIP;
+      catalog[0].measure[m].dbFlags |= ID_MEAS_SKIP_PHOTOM;
       Nskip ++;
     }