Index: /branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/ImageOps.c
===================================================================
--- /branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/ImageOps.c	(revision 38702)
+++ /branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/ImageOps.c	(revision 38703)
@@ -1,3 +1,4 @@
 # include "relastro.h"
+int isGPC1chip (int photcode);
 
 # define USE_IMAGE_ID 1
@@ -690,4 +691,11 @@
       raw[i].mask |= MARK_NAN_POS_ERROR;
     }
+
+    // XXX A TEST: can we use only 2MASS measurements to fit the images?
+    if (!(measure[0].dbFlags & ID_MEAS_OBJECT_HAS_2MASS)) {
+      fprintf (stderr, "@");
+      raw[i].mask |= MARK_BIG_OFFSET;
+    }
+
     raw[i].Nmeas = catalog[c].average[n].Nmeasure; // record so we can check how well connected an image is
 
@@ -1225,5 +1233,6 @@
   }  
   
-  if (MinBadQF > 0.0) {
+  if ((MinBadQF > 0.0) && isGPC1chip(measure[0].photcode)) {
+    if (!isfinite(measure[0].psfQF)) return FALSE;
     if (measure[0].psfQF < MinBadQF) return FALSE;
   }