Index: /trunk/psphot/src/psphotMagnitudes.c
===================================================================
--- /trunk/psphot/src/psphotMagnitudes.c	(revision 12600)
+++ /trunk/psphot/src/psphotMagnitudes.c	(revision 12601)
@@ -13,13 +13,11 @@
     pmSourceMagnitudesInit (recipe);
 
-    // XXX require (assert) that we have a background model, or 
+    // XXX require that we have a background model, or 
     // allow it to be missing, setting local sky to 0.0?
-
-    // Get enough information to return sky level
-    assert(background != NULL);
+    PS_ASSERT (background, false);
 
     // the binning details are saved on the analysis metadata 
     psImageBinning *binning = psMetadataLookupPtr(&status, recipe, "PSPHOT.BACKGROUND.BINNING");
-    assert (status == true);
+    PS_ASSERT (status, false);
 
     bool IGNORE_GROWTH = psMetadataLookupBool (&status, recipe, "IGNORE_GROWTH");
Index: /trunk/psphot/src/psphotOutput.c
===================================================================
--- /trunk/psphot/src/psphotOutput.c	(revision 12600)
+++ /trunk/psphot/src/psphotOutput.c	(revision 12601)
@@ -81,10 +81,9 @@
 
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.INPUT");
-    assert (status);
+    PS_ASSERT (status, false);
 
     // determine PHOTCODE from fpa & view, overwrite in recipe
-    // XXX test this:
     char *photcode = pmConceptsPhotcodeForView (config, input, view);
-    assert (photcode);
+    PS_ASSERT (photcode, false);
 
     psMetadataAddStr (recipe, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "photcode from FPA concepts", photcode);
Index: /trunk/psphot/src/psphotSourceFits.c
===================================================================
--- /trunk/psphot/src/psphotSourceFits.c	(revision 12600)
+++ /trunk/psphot/src/psphotSourceFits.c	(revision 12601)
@@ -363,5 +363,5 @@
     // use the source moments, etc to guess basic model parameters
     pmModel *EXT = pmSourceModelGuess (source, modelTypeEXT);
-    assert (EXT != NULL);
+    PS_ASSERT (EXT, NULL);
 	
     // if (isnan(EXT->params->data.F32[1])) psAbort("nan in ext fit");