Index: /tags/ipp-20141224/psphot/src/psphotGalaxyParams.c
===================================================================
--- /tags/ipp-20141224/psphot/src/psphotGalaxyParams.c	(revision 37790)
+++ /tags/ipp-20141224/psphot/src/psphotGalaxyParams.c	(revision 37791)
@@ -105,5 +105,5 @@
 
     psImage *footprintImage = NULL;
-#ifdef USE_FOOTPRINTS
+#if USE_FOOTPRINTS
     footprintImage = psImageAlloc(readout->image->numCols, readout->image->numRows, PS_TYPE_S32);
     psImageInit(footprintImage, 0);
@@ -246,5 +246,5 @@
     psMetadata *recipe      = job->args->data[3];
 
-#ifndef USE_FOOTPRINTS
+#if (!USE_FOOTPRINTS)
     float skynoise          = PS_SCALAR_VALUE(job->args->data[4],F32);
 #endif
@@ -262,5 +262,5 @@
     // don't try and use bad models
     pmModelStatus badModel = PM_MODEL_STATUS_NONE;
-    badModel |= PM_MODEL_STATUS_NONCONVERGE;
+//    badModel |= PM_MODEL_STATUS_NONCONVERGE;  this causes most objects to get unmeasured
     badModel |= PM_MODEL_STATUS_BADARGS;
     badModel |= PM_MODEL_STATUS_OFFIMAGE;
@@ -418,5 +418,5 @@
 #endif
 
-#ifdef USE_FOOTPRINTS
+#if (USE_FOOTPRINTS)
         psS32 **vFootprint = footprintImage->data.S32;
 #else
@@ -451,5 +451,5 @@
                 }
 
-#ifdef USE_FOOTPRINTS
+#if (USE_FOOTPRINTS)
 		// this is a pixel in the object
                 if (vFootprint[yImage][xImage] == source->peak->footprint->id) {
@@ -477,5 +477,5 @@
                 if (isnan(mirrorPixel)) continue;
 
-#ifdef USE_FOOTPRINTS
+#if (USE_FOOTPRINTS)
                 if (vFootprint[yFlip + row0][xFlip + col0] == 0) {
 #else
@@ -602,5 +602,5 @@
         source->extpars->gS2 = source->extpars->gRT + source->extpars->gRA;
 
-#ifdef PRINT_STUFF
+#if (PRINT_STUFF)
         if (Ngood % 40 == 1) {
 	  fprintf (stderr, "   id  sumI rHL rad   sumI     gRT   gRA       sumRt      sumBt         numPixels numBGPixels\n");