Changeset 11702

Timestamp:

Feb 7, 2007, 5:52:32 PM (19 years ago)

Author:

jhoblitt

Message:

update psAbort() API

Location:

trunk

Files:

• ippTools/src/camtool.c (modified) (1 diff)
• ippTools/src/camtoolConfig.c (modified) (1 diff)
• ippTools/src/chiptool.c (modified) (1 diff)
• ippTools/src/chiptoolConfig.c (modified) (1 diff)
• ippTools/src/detselect.c (modified) (1 diff)
• ippTools/src/detselectConfig.c (modified) (1 diff)
• ippTools/src/dettool.c (modified) (9 diffs)
• ippTools/src/dettoolConfig.c (modified) (1 diff)
• ippTools/src/guidetool.c (modified) (1 diff)
• ippTools/src/pxadmin.c (modified) (1 diff)
• ippTools/src/pxadminConfig.c (modified) (3 diffs)
• ippTools/src/pxinject.c (modified) (1 diff)
• ippTools/src/pztool.c (modified) (1 diff)
• ippTools/src/pztoolConfig.c (modified) (1 diff)
• ippTools/src/regtool.c (modified) (1 diff)
• ippTools/src/regtoolConfig.c (modified) (1 diff)
• ippTools/src/warptool.c (modified) (1 diff)
• ippTools/src/warptoolConfig.c (modified) (1 diff)
• ppImage/src/ppFocusParseCamera.c (modified) (4 diffs)
• ppImage/src/ppImageDetrendNonLinear.c (modified) (1 diff)
• ppImage/src/ppImageParseCamera.c (modified) (1 diff)
• psastro/src/psastroLuminosityFunction.c (modified) (1 diff)
• psastro/src/psastroWCS.c (modified) (7 diffs)
• psphot/src/models/pmModel_STRAIL.c (modified) (4 diffs)
• psphot/src/models/pmModel_TEST1.c (modified) (5 diffs)
• psphot/src/psphotBlendFit.c (modified) (1 diff)
• psphot/src/psphotChoosePSF.c (modified) (4 diffs)
• psphot/src/psphotEnsemblePSF.c (modified) (3 diffs)
• psphot/src/psphotModelTest.c (modified) (4 diffs)
• psphot/src/psphotOutput.c (modified) (1 diff)
• psphot/src/psphotRadiusChecks.c (modified) (3 diffs)
• psphot/src/psphotSkyReplace.c (modified) (1 diff)
• psphot/src/psphotSourceFits.c (modified) (5 diffs)
• psphot/src/psphotTestPSF.c (modified) (2 diffs)
• psphot/src/psphotWeightBias.c (modified) (1 diff)

trunk/ippTools/src/camtool.c

@@ -59 +59 @@
         MODECASE(P3TOOL_MODE_UNBLOCK,           unblockMode);
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/camtoolConfig.c

@@ -188 +188 @@
         while ((item = psMetadataGetAndIncrement(iter))) {
             if (!item->type == PS_DATA_METADATA) {
-                psAbort(argv[0], "all options must be specified as a metadata");            }
+                psAbort("all options must be specified as a metadata");            }
 
             fprintf(stdout, "%s ", item->name);

trunk/ippTools/src/chiptool.c

@@ -65 +65 @@
         MODECASE(P2TOOL_MODE_UNBLOCK,               unblockMode);
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/chiptoolConfig.c

@@ -225 +225 @@
         while ((item = psMetadataGetAndIncrement(iter))) {
             if (!item->type == PS_DATA_METADATA) {
-                psAbort(argv[0], "all options must be specified as a metadata");            }
+                psAbort("all options must be specified as a metadata");            }
 
             fprintf(stdout, "%s ", item->name);

trunk/ippTools/src/detselect.c

@@ -47 +47 @@
         MODECASE(DETSELECT_MODE_SELECT,        selectMode);
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/detselectConfig.c

@@ -118 +118 @@
         while ((item = psMetadataGetAndIncrement(iter))) {
             if (!item->type == PS_DATA_METADATA) {
-                psAbort(argv[0], "all options must be specified as a metadata");            }
+                psAbort("all options must be specified as a metadata");            }
 
             fprintf(stdout, "%s ", item->name);

trunk/ippTools/src/dettool.c

@@ -136 +136 @@
         MODECASE(DETTOOL_MODE_REGISTER_DETREND_IMFILE, register_detrend_imfileMode);
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 
@@ -457 +457 @@
         psFree(iter);
     } else {
-        psAbort(config->argv[0],
-                "-exp_tag was not parsed correctly (this should not happen");
+        psAbort(                "-exp_tag was not parsed correctly (this should not happen");
     }
 
@@ -476 +475 @@
     // we should have one rawExp row per exp_tag specified
     if (psListLength(item->data.list) != psArrayLength(detrendExps)) {
-        psAbort(config->argv[0],
-    "an -exp_tag matched more then one rawExp (this should not happen");
+        psAbort(    "an -exp_tag matched more then one rawExp (this should not happen");
 
     }
@@ -579 +577 @@
     // sanity check results
     if (psArrayLength(detRuns) != 1) {
-        psAbort(config->argv[0], "found more then one detRun matching det_id %ld(this should not happen)", det_id);
+        psAbort("found more then one detRun matching det_id %ld(this should not happen)", det_id);
         return false;
     }
@@ -1213 +1211 @@
     // sanity check results
     if (psArrayLength(detRuns) != 1) {
-        psAbort(config->argv[0], "found more then one detRun matching det_id %ld(this should not happen)", det_id);
+        psAbort("found more then one detRun matching det_id %ld(this should not happen)", det_id);
         return false;
     }
@@ -1266 +1264 @@
     // sanity check the result... we should have only found one det_id
     if (psArrayLength(detRuns) != 1) {
-        psAbort(config->argv[0], "found more then one detRun matching det_id %d(this should not happen)", (psS32)atoi(det_id));
+        psAbort("found more then one detRun matching det_id %d(this should not happen)", (psS32)atoi(det_id));
         return false;                   // unreachable
     }
@@ -1627 +1625 @@
     // sanity check the result... we should have only found one det_id
     if (psArrayLength(newDetRuns) != 1) {
-        psAbort(config->argv[0], "found more then one detRun matching det_id %ld(this should not happen)", newDet_id);
+        psAbort("found more then one detRun matching det_id %ld(this should not happen)", newDet_id);
         return false;                   // unreachable
     }
@@ -5962 +5960 @@
         psFree(iter);
     } else {
-        psAbort(config->argv[0],
-                "-exp_tag was not parsed correctly (this should not happen");
+        psAbort(                "-exp_tag was not parsed correctly (this should not happen");
     }
 
@@ -6462 +6459 @@
     if (psArrayLength(detRuns) != 1) {
         // this should no happen
-        psAbort(config->argv[0],
-                "database query return too many rows (this should not happen");
+        psAbort(                "database query return too many rows (this should not happen");
     }
 

trunk/ippTools/src/dettoolConfig.c

@@ -863 +863 @@
         while ((item = psMetadataGetAndIncrement(iter))) {
             if (!item->type == PS_DATA_METADATA) {
-                psAbort(argv[0], "all options must be specified as a metadata");
+                psAbort("all options must be specified as a metadata");
             }
 

trunk/ippTools/src/guidetool.c

@@ -47 +47 @@
             break;
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/pxadmin.c

@@ -50 +50 @@
             break;
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/pxadminConfig.c

@@ -49 +49 @@
         psArgumentRemove(N, &argc, argv);
         if (config->mode) {
-            psAbort(argv[0], "only one mode selection is allowed");
+            psAbort("only one mode selection is allowed");
         }
         config->mode = PXADMIN_MODE_CREATE;
@@ -56 +56 @@
         psArgumentRemove(N, &argc, argv);
         if (config->mode) {
-            psAbort(argv[0], "only one mode selection is allowed");
+            psAbort("only one mode selection is allowed");
         }
         config->mode = PXADMIN_MODE_DELETE;
@@ -63 +63 @@
         psArgumentRemove(N, &argc, argv);
         if (config->mode) {
-            psAbort(argv[0], "only one mode selection is allowed");
+            psAbort("only one mode selection is allowed");
         }
         config->mode = PXADMIN_MODE_RECREATE;

trunk/ippTools/src/pxinject.c

@@ -49 +49 @@
         MODECASE(PXINJECT_MODE_NEWIMFILE, newImfileMode);
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/pztool.c

@@ -55 +55 @@
         MODECASE(PZTOOL_MODE_COPYDONE, copydoneMode);
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/pztoolConfig.c

@@ -139 +139 @@
         while ((item = psMetadataGetAndIncrement(iter))) {
             if (!item->type == PS_DATA_METADATA) {
-                psAbort(argv[0], "all options must be specified as a metadata");
+                psAbort("all options must be specified as a metadata");
             }
 

trunk/ippTools/src/regtool.c

@@ -72 +72 @@
         MODECASE(P0TOOL_MODE_UPDATEPROCESSEDEXP,    updateprocessedexpMode);
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/regtoolConfig.c

@@ -259 +259 @@
         while ((item = psMetadataGetAndIncrement(iter))) {
             if (!item->type == PS_DATA_METADATA) {
-                psAbort(argv[0], "all options must be specified as a metadata");            }
+                psAbort("all options must be specified as a metadata");            }
 
             fprintf(stdout, "%s ", item->name);

trunk/ippTools/src/warptool.c

@@ -69 +69 @@
         MODECASE(P4TOOL_MODE_DIFFIMFILE,        diffimfileMode);
         default:
-            psAbort(argv[0], "invalid option (this should not happen)");
+            psAbort("invalid option (this should not happen)");
     }
 

trunk/ippTools/src/warptoolConfig.c

@@ -229 +229 @@
         while ((item = psMetadataGetAndIncrement(iter))) {
             if (!item->type == PS_DATA_METADATA) {
-                psAbort(argv[0], "all options must be specified as a metadata");
+                psAbort("all options must be specified as a metadata");
             }
 

trunk/ppImage/src/ppFocusParseCamera.c

@@ -29 +29 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.BIAS");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.BIAS", input->fpa, PM_DETREND_TYPE_BIAS);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a bias image source");
+        if (!status) psAbort("can't find a bias image source");
     }
     if (options->doDark) {
@@ -36 +36 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.DARK");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.DARK", input->fpa, PM_DETREND_TYPE_DARK);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a dark image source");
+        if (!status) psAbort("can't find a dark image source");
     }
     if (options->doMask) {
@@ -43 +43 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.MASK");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.MASK", input->fpa, PM_DETREND_TYPE_MASK);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a mask image source");
+        if (!status) psAbort("can't find a mask image source");
     }
     if (options->doFlat) {
@@ -50 +50 @@
         pmFPAfileDefineFromConf  (&status, config, "PPIMAGE.FLAT");
         pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FLAT", input->fpa, PM_DETREND_TYPE_FLAT);
-        if (!status) psAbort ("ppImageParseDetrend", "can't find a flat image source");
+        if (!status) psAbort("can't find a flat image source");
     }
 

trunk/ppImage/src/ppImageDetrendNonLinear.c

@@ -108 +108 @@
         }
       default:
-        psAbort("phase2", "Invalid options->nonLinearType");
+        psAbort("Invalid options->nonLinearType");
     }
     return true;

trunk/ppImage/src/ppImageParseCamera.c

@@ -126 +126 @@
             filters = psMemIncrRefCounter(mdi->data.list);
         } else {
-            psAbort ("ppImage", "invalid type for FRINGE.FILTERS");
+            psAbort("invalid type for FRINGE.FILTERS");
         }
 

trunk/psastro/src/psastroLuminosityFunction.c

@@ -51 +51 @@
     if (!isfinite(star->Mag)) continue;
     int bin = (star->Mag - mMin) / dMag;
-    if (bin < 0) psAbort ("psastro", "bin cannot be negative!");
-    if (bin >= nBin) psAbort ("psastro", "bin cannot be > %d!", nBin);
+    if (bin < 0) psAbort("bin cannot be negative!");
+    if (bin >= nBin) psAbort("bin cannot be > %d!", nBin);
     nMags->data.F32[bin] += 1.0;
   }

trunk/psastro/src/psastroWCS.c

@@ -142 +142 @@
             fpa->toSky = toSky;
         } else {
-            if (fpa->toTPA == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
-            if (fpa->fromTPA == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
+            if (fpa->toTPA == NULL) psAbort("projection defined, tangent-plane not defined");
+            if (fpa->fromTPA == NULL) psAbort("projection defined, tangent-plane not defined");
 
             // adjust for common toSky for mosaic:
@@ -212 +212 @@
 
     // techinically, we can have a plate scale here (toTPA:dx,dy != 1)
-    if (!psPlaneDistortIsIdentity (toTPA)) psAbort ("psastro", "invalid TPA transformation");
+    if (!psPlaneDistortIsIdentity (toTPA)) psAbort("invalid TPA transformation");
     
     // XXX require toFPA->x->nX == toFPA->x->nY
@@ -395 +395 @@
     psMetadataAddF32 (header, PS_LIST_TAIL, "CDELT2",   PS_META_REPLACE, "", 1.0);
 
-    if (toFPA->x->nX != toFPA->x->nY) psAbort ("psastro", "mis-matched tangent plane orders (1)");
-    if (toFPA->x->nX != toFPA->y->nX) psAbort ("psastro", "mis-matched tangent plane orders (2)");
-    if (toFPA->x->nX != toFPA->y->nY) psAbort ("psastro", "mis-matched tangent plane orders (3)");
+    if (toFPA->x->nX != toFPA->x->nY) psAbort("mis-matched tangent plane orders (1)");
+    if (toFPA->x->nX != toFPA->y->nX) psAbort("mis-matched tangent plane orders (2)");
+    if (toFPA->x->nX != toFPA->y->nY) psAbort("mis-matched tangent plane orders (3)");
 
     switch (toFPA->x->nX) {
@@ -428 +428 @@
 
       case 0:
-        psAbort ("psastro", "invalid tangent plane order");
+        psAbort("invalid tangent plane order");
     }
     return true;
@@ -450 +450 @@
     psMetadataAddF32 (header, PS_LIST_TAIL, "CDELT2",   PS_META_REPLACE, "", toSky->Ys*DEG_RAD*plateScale);
 
-    if (toTP->x->nX != toTP->x->nY) psAbort ("psastro", "mis-matched tangent plane orders (1)");
-    if (toTP->x->nX != toTP->y->nX) psAbort ("psastro", "mis-matched tangent plane orders (2)");
-    if (toTP->x->nX != toTP->y->nY) psAbort ("psastro", "mis-matched tangent plane orders (3)");
+    if (toTP->x->nX != toTP->x->nY) psAbort("mis-matched tangent plane orders (1)");
+    if (toTP->x->nX != toTP->y->nX) psAbort("mis-matched tangent plane orders (2)");
+    if (toTP->x->nX != toTP->y->nY) psAbort("mis-matched tangent plane orders (3)");
 
     switch (toTP->x->nX) {
@@ -483 +483 @@
 
       case 0:
-        psAbort ("psastro", "invalid tangent plane order");
+        psAbort("invalid tangent plane order");
     }
     return header;
@@ -493 +493 @@
     psPlaneDistort *distort;
 
-    if (order < 1) psAbort ("psastro", "invalid order");
-    if (order > 3) psAbort ("psastro", "invalid order");
+    if (order < 1) psAbort("invalid order");
+    if (order > 3) psAbort("invalid order");
     
     // all coeffs and masks initially set to 0

trunk/psphot/src/models/pmModel_STRAIL.c

@@ -333 +333 @@
 
           default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for beta test", nParam);
+            psAbort("invalid parameter %d for beta test", nParam);
         }
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
@@ -353 +353 @@
 
           default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param min test", nParam);
+            psAbort("invalid parameter %d for param min test", nParam);
         }
         if (params[nParam] < params_min) {
@@ -372 +372 @@
           case 8:           params_max =  M_PI; break;
           default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param max test", nParam);
+            psAbort("invalid parameter %d for param max test", nParam);
         }
         if (params[nParam] > params_max) {
@@ -380 +380 @@
         return true;
       default:
-        psAbort ("psModules.pmModel_GAUSS", "invalid choice for limits");
+        psAbort("invalid choice for limits");
     }
-    psAbort ("psModules.pmModel_GAUSS", "should not reach here");
+    psAbort("should not reach here");
     return false;
 }

trunk/psphot/src/models/pmModel_TEST1.c

@@ -76 +76 @@
           case PM_PAR_SXY:  beta_lim = 0.5;   break;
           default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for beta test", nParam);
+            psAbort("invalid parameter %d for beta test", nParam);
         }
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
@@ -93 +93 @@
           case PM_PAR_SXY:  params_min =  -5.0; break;
           default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param min test", nParam);
+            psAbort("invalid parameter %d for param min test", nParam);
         }
         if (params[nParam] < params_min) {
@@ -110 +110 @@
           case PM_PAR_SXY:  params_max =  +5.0; break;
           default:
-            psAbort ("psModules.pmModel_GAUSS", "invalid parameter %d for param max test", nParam);
+            psAbort("invalid parameter %d for param max test", nParam);
         }
         if (params[nParam] > params_max) {
@@ -118 +118 @@
         return true;
       default:
-        psAbort ("psModules.pmModel_GAUSS", "invalid choice for limits");
-    }
-    psAbort ("psModules.pmModel_GAUSS", "should not reach here");
+        psAbort("invalid choice for limits");
+    }
+    psAbort("should not reach here");
     return false;
 }
@@ -201 +201 @@
     psF64 radius = axes.major * sqrt (2.0 * log(params->data.F32[PM_PAR_I0] / flux));
 
-    if (isnan(radius)) psAbort ("psphot.model", "error in code: never return invalid radius");
-    if (radius < 0) psAbort ("psphot.model", "error in code: never return invalid radius");
+    if (isnan(radius)) psAbort("error in code: never return invalid radius");
+    if (radius < 0) psAbort("error in code: never return invalid radius");
 
     return (radius);

trunk/psphot/src/psphotBlendFit.c

@@ -27 +27 @@
     char *region = psMetadataLookupStr (&status, recipe, "ANALYSIS_REGION");
     psRegion AnalysisRegion = psRegionForImage (readout->image, psRegionFromString (region));
-    if (psRegionIsNaN (AnalysisRegion)) psAbort ("psphot", "analysis region mis-defined");
+    if (psRegionIsNaN (AnalysisRegion)) psAbort("analysis region mis-defined");
 
     for (int i = 0; i < sources->n; i++) {

trunk/psphot/src/psphotChoosePSF.c

@@ -15 +15 @@
     psf = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.PSF");
     if (psf != NULL) {
-        if (!psphotPSFstats (readout, recipe, psf)) psAbort ("psphotChoosePSF", "cannot measure PSF shape terms");
+        if (!psphotPSFstats (readout, recipe, psf)) psAbort("cannot measure PSF shape terms");
         return psf;
     }
@@ -96 +96 @@
     psList *list = NULL;
     psMetadataItem *mdi = psMetadataLookup (recipe, "PSF_MODEL");
-    if (mdi == NULL) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection");
+    if (mdi == NULL) psAbort("missing PSF_MODEL selection");
 
     if (mdi->type == PS_DATA_STRING) {
@@ -102 +102 @@
         psListAdd (list, PS_LIST_HEAD, mdi);
     } else {
-        if (mdi->type != PS_DATA_METADATA_MULTI) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection");
+        if (mdi->type != PS_DATA_METADATA_MULTI) psAbort("missing PSF_MODEL selection");
         list = psMemIncrRefCounter(mdi->data.list);
     }
@@ -247 +247 @@
     psFree (models);
 
-    if (!psphotPSFstats (readout, recipe, psf)) psAbort ("psphotChoosePSF", "cannot measure PSF shape terms");
+    if (!psphotPSFstats (readout, recipe, psf)) psAbort("cannot measure PSF shape terms");
 
     modelName = pmModelGetType (psf->type);

trunk/psphot/src/psphotEnsemblePSF.c

@@ -34 +34 @@
     psRegion AnalysisRegion = psRegionFromString (region);
     AnalysisRegion = psRegionForImage (readout->image, AnalysisRegion);
-    if (psRegionIsNaN (AnalysisRegion)) psAbort ("psphot", "analysis region mis-defined");
+    if (psRegionIsNaN (AnalysisRegion)) psAbort("analysis region mis-defined");
 
     bool CONSTANT_PHOTOMETRIC_WEIGHTS =
         psMetadataLookupBool(&status, recipe, "CONSTANT_PHOTOMETRIC_WEIGHTS");
     if (!status) {
-        psAbort(PS_FILE_LINE, "You must provide a value for the BOOL recipe CONSTANT_PHOTOMETRIC_WEIGHTS");
+        psAbort("You must provide a value for the BOOL recipe CONSTANT_PHOTOMETRIC_WEIGHTS");
     }
     int SKY_FIT_ORDER = psMetadataLookupS32(&status, recipe, "SKY_FIT_ORDER");
@@ -161 +161 @@
 
           default:
-            psAbort(PS_FILE_LINE, "Invalid SKY_FIT_ORDER %d\n", SKY_FIT_ORDER);
+            psAbort("Invalid SKY_FIT_ORDER %d\n", SKY_FIT_ORDER);
             break;
         }
@@ -211 +211 @@
         // assign linearly-fitted normalization
         if (isnan(norm->data.F32[i])) {
-            psAbort ("psphot", "ensemble source is nan");
+            psAbort("ensemble source is nan");
         }
         model->params->data.F32[PM_PAR_I0] = norm->data.F32[i];

trunk/psphot/src/psphotModelTest.c

@@ -33 +33 @@
     if (fitMode == PM_SOURCE_FIT_PSF) {
         char *psfFile = psMetadataLookupStr (&status, recipe, "PSF_INPUT_FILE");
-        if (!status) psAbort ("psphotModelTest", "PSF_INPUT_FILE not supplied");
+        if (!status) psAbort("PSF_INPUT_FILE not supplied");
         psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, psfFile, FALSE);
         psf = pmPSFfromMetadata (psfData);
@@ -45 +45 @@
             psList *list = NULL;
             psMetadataItem *mdi = psMetadataLookup (recipe, "PSF_MODEL");
-            if (mdi == NULL) psAbort ("psphotModelTest", "missing PSF_MODEL selection");
+            if (mdi == NULL) psAbort("missing PSF_MODEL selection");
             if (mdi->type == PS_DATA_STRING) {
                 list = psListAlloc(NULL);
                 psListAdd (list, PS_LIST_HEAD, mdi);
             } else {
-                if (mdi->type != PS_DATA_METADATA_MULTI) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection");
+                if (mdi->type != PS_DATA_METADATA_MULTI) psAbort("missing PSF_MODEL selection");
                 list = psMemIncrRefCounter(mdi->data.list);
             }
@@ -59 +59 @@
         }
         modelType = pmModelSetType (modelName);
-        if (modelType < 0) psAbort ("fitsource", "unknown model %s", modelName);
+        if (modelType < 0) psAbort("unknown model %s", modelName);
     }
 
@@ -94 +94 @@
     // find the local sky
     status = pmSourceLocalSky (source, PS_STAT_SAMPLE_MEDIAN, INNER);
-    if (!status) psAbort ("fitsource", "pmSourceLocalSky error");
+    if (!status) psAbort("pmSourceLocalSky error");
 
     // get the source moments
     status = pmSourceMoments (source, mRADIUS);
-    if (!status) psAbort ("fitsource", "pmSourceLocalSky error");
+    if (!status) psAbort("pmSourceLocalSky error");
     source->peak->value = source->moments->Peak;
 

trunk/psphot/src/psphotOutput.c

@@ -51 +51 @@
 
     FILE *f = fopen (name, "w");
-    if (f == NULL) psAbort ("psphot", "can't open file");
+    if (f == NULL) psAbort("can't open file");
 
     for (int i = 0; i < source->pixels->numRows; i++) {

trunk/psphot/src/psphotRadiusChecks.c

@@ -40 +40 @@
     model->radiusFit = (RADIUS_TYPE)(radiusFit + PSF_FIT_PADDING);
 
-    if (isnan(model->radiusFit)) psAbort ("apply_psf_model", "error in radius");
+    if (isnan(model->radiusFit)) psAbort("error in radius");
         
     if (source->mode & PM_SOURCE_MODE_SATSTAR) {
@@ -57 +57 @@
     // set the fit radius based on the object flux limit and the model
     model->radiusFit = (RADIUS_TYPE) (modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING);
-    if (isnan(model->radiusFit)) psAbort ("apply_psf_model", "error in radius");
+    if (isnan(model->radiusFit)) psAbort("error in radius");
         
     if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
@@ -91 +91 @@
     // set the fit radius based on the object flux limit and the model
     model->radiusFit = (RADIUS_TYPE) (modelRadiusEXT (model->params, EXT_FIT_NSIGMA*moments->dSky) + EXT_FIT_PADDING);
-    if (isnan(model->radiusFit)) psAbort (__func__, "error in radius");
+    if (isnan(model->radiusFit)) psAbort("error in radius");
 
     // redefine the pixels if needed

trunk/psphot/src/psphotSkyReplace.c

@@ -9 +9 @@
     // find the currently selected readout
     pmReadout *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT");
-    if (readout == NULL) psAbort ("psphot", "input not defined");
+    if (readout == NULL) psAbort("input not defined");
 
     // select background pixels, from output background file, or create
     pmReadout *background = pmFPAfileThisReadout (config->files, view, "PSPHOT.BACKGND");
-    if (background == NULL) psAbort ("psphot", "background not defined");
+    if (background == NULL) psAbort("background not defined");
 
     // select the corresponding images

trunk/psphot/src/psphotSourceFits.c

@@ -34 +34 @@
     pmModel *PSF = pmModelCopy (source->modelPSF);
 
-    if (isnan(PSF->params->data.F32[PM_PAR_I0])) psAbort ("psphot", "nan in blend fit primary");
+    if (isnan(PSF->params->data.F32[PM_PAR_I0])) psAbort("nan in blend fit primary");
 
     x = PSF->params->data.F32[PM_PAR_XPOS];
@@ -67 +67 @@
         // these should never be invalid values
         // XXX drop these tests eventually
-        if (isnan(model->params->data.F32[PM_PAR_I0])) psAbort ("psphot", "nan in blend fit");
-        if (isnan(model->params->data.F32[PM_PAR_XPOS])) psAbort ("psphot", "nan in blend fit");
-        if (isnan(model->params->data.F32[PM_PAR_YPOS])) psAbort ("psphot", "nan in blend fit");
+        if (isnan(model->params->data.F32[PM_PAR_I0])) psAbort("nan in blend fit");
+        if (isnan(model->params->data.F32[PM_PAR_XPOS])) psAbort("nan in blend fit");
+        if (isnan(model->params->data.F32[PM_PAR_YPOS])) psAbort("nan in blend fit");
 
         // add this blend to the list
@@ -145 +145 @@
     // save the PSF model from the Ensemble fit
     pmModel *PSF = pmModelCopy (source->modelPSF);
-    if (isnan(PSF->params->data.F32[1])) psAbort ("psphot", "nan in psf fit");
+    if (isnan(PSF->params->data.F32[1])) psAbort("nan in psf fit");
 
     // extend source radius as needed
@@ -328 +328 @@
     PSF = source->modelPSF;
     psphotCheckRadiusPSFBlend (readout, source, PSF, 8.0);
-    if (isnan(PSF->params->data.F32[1])) psAbort ("psphot", "nan in dbl fit");
+    if (isnan(PSF->params->data.F32[1])) psAbort("nan in dbl fit");
 
     modelSet = psArrayAlloc (2);
@@ -365 +365 @@
     assert (EXT != NULL);
         
-    // if (isnan(EXT->params->data.F32[1])) psAbort ("psphot", "nan in ext fit");
+    // if (isnan(EXT->params->data.F32[1])) psAbort("nan in ext fit");
 
     psphotCheckRadiusEXT (readout, source, EXT);

trunk/psphot/src/psphotTestPSF.c

@@ -74 +74 @@
     // for this test, require a single model
     psMetadataItem *mdi = psMetadataLookup (recipe, "PSF_MODEL");
-    if (mdi == NULL) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection");
-    if (mdi->type != PS_DATA_STRING) psAbort ("psphotChoosePSF", "choose a single PSF_MODEL");
+    if (mdi == NULL) psAbort("missing PSF_MODEL selection");
+    if (mdi->type != PS_DATA_STRING) psAbort("choose a single PSF_MODEL");
     modelName = mdi->data.V;
 
@@ -95 +95 @@
     pmModelType type = pmModelSetType (modelName);
     pmPSF *psf = pmPSFAlloc (type, poissonErrors, psfTrendMask);
-    if (psf == NULL) psAbort ("psphotTestPSF", "unknown model");
+    if (psf == NULL) psAbort("unknown model");
 
     FILE *f = fopen ("params.dat", "w");

trunk/psphot/src/psphotWeightBias.c

@@ -34 +34 @@
     char *region = psMetadataLookupStr (&status, recipe, "ANALYSIS_REGION");
     psRegion AnalysisRegion = psRegionForImage (readout->image, psRegionFromString (region));
-    if (psRegionIsNaN (AnalysisRegion)) psAbort ("psphot", "analysis region mis-defined");
+    if (psRegionIsNaN (AnalysisRegion)) psAbort("analysis region mis-defined");
 
     FILE *f = fopen ("bias.dat", "w");
-    if (f == NULL) psAbort ("psphot", "can't open output file");
+    if (f == NULL) psAbort("can't open output file");
 
     for (int i = 0; i < sources->n; i++) {