Changeset 12601

Timestamp:

Mar 27, 2007, 9:05:13 AM (19 years ago)

Author:

eugene

Message:

asserts to PS_ASSERTs

Location:

trunk/psphot/src

Files:

• psphotMagnitudes.c (modified) (1 diff)
• psphotOutput.c (modified) (1 diff)
• psphotSourceFits.c (modified) (1 diff)

trunk/psphot/src/psphotMagnitudes.c

@@ -13 +13 @@
     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");

trunk/psphot/src/psphotOutput.c

@@ -81 +81 @@
 
     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);

trunk/psphot/src/psphotSourceFits.c

@@ -363 +363 @@
     // 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");