Index: /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/airmass.c
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/airmass.c	(revision 37575)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/airmass.c	(revision 37576)
@@ -20,12 +20,10 @@
     Nbad_airmass ++;
   }
+  if ((Nbad_airmass > 10) && ((Nbad_airmass % 1000) == 10)) {
+    fprintf (stderr, "*** WARNING *** %d NaN airmass values : what is the problem?\n", Nbad_airmass);
+  }
   if (Nbad_airmass > 1) {
     fprintf (stderr, "*** WARNING *** NaN airmass for detection\n");
     fprintf (stderr, "*** ra, dec : %f, %f | st : %f | lat : %f | cosz : %f\n", ra, dec, st, latitude, cosz);
-  }
-  if (Nbad_airmass > 10) {
-    fprintf (stderr, "*** ERROR *** more than 10 NaN airmass values for detections, giving up\n");
-    fprintf (stderr, " (use -quick-airmass to use image airmass)\n");
-    exit (2);
   }
 
Index: /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/load_template_images.c
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/load_template_images.c	(revision 37575)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/load_template_images.c	(revision 37576)
@@ -58,4 +58,7 @@
       continue;
     }
+    // XXX hard=wire the photcode range for now (just i-band)
+    if (childImage->photcode < 10200) continue;
+    if (childImage->photcode < 10277) continue;
 
     refimage[Nrefimage].secz     = childImage->secz;
Index: /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/make_fake_stars_catalog.c
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/make_fake_stars_catalog.c	(revision 37575)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/make_fake_stars_catalog.c	(revision 37576)
@@ -86,5 +86,5 @@
 
     // XXX skip stars with low S/N
-    if (SN < 5.0) continue;
+    if ((SN < 5.0) || isnan (SN)) continue;
 
     // true position from src catalog
@@ -124,4 +124,7 @@
     Robs = ohana_normalize_angle (Robs);
 
+    if (isnan(Robs)) continue;
+    if (isnan(Dobs)) continue;
+
     double X, Y;
     RD_to_XY (&X, &Y, Robs, Dobs, &image->coords);
@@ -135,4 +138,6 @@
     if (X > image->NX) continue;
     if (Y > image->NY) continue;
+    if (isnan(X)) continue;
+    if (isnan(Y)) continue;
 
     if (!strcmp (image->name, "o6600g0127o.672655.cm.955522.smf[XY01]")) {
@@ -164,4 +169,6 @@
 
     stars[Nstars].measure.airmass = airmass (image->secz, stars[Nstars].average.R, stars[Nstars].average.D, image->sidtime, image->latitude);
+    if (!isfinite(stars[Nstars].measure.airmass)) continue;
+
     stars[Nstars].measure.az      = azimuth (15.0*image->sidtime - stars[Nstars].average.R, stars[Nstars].average.D, image->latitude);
     stars[Nstars].measure.Mcal    = image->Mcal;
Index: /branches/eam_branches/ipp-20140904/Ohana/src/uniphot/Makefile
===================================================================
--- /branches/eam_branches/ipp-20140904/Ohana/src/uniphot/Makefile	(revision 37575)
+++ /branches/eam_branches/ipp-20140904/Ohana/src/uniphot/Makefile	(revision 37576)
@@ -128,6 +128,6 @@
 $(SRC)/initialize_setastrom.$(ARCH).o
 
-$(SETGALMODEL_CLIENT): $(INC)/setgalmodel.h
-$(BIN)/setgalmodel_client.$(ARCH): $(SETGALMODEL_CLIENT)
+$(SETASTROM_CLIENT): $(INC)/setastrom.h
+$(BIN)/setastrom_client.$(ARCH): $(SETASTROM_CLIENT)
 
 SETGALMODEL = \