Index: trunk/psphot/src/models/pmModel_STRAIL.c =================================================================== --- trunk/psphot/src/models/pmModel_STRAIL.c (revision 11583) +++ trunk/psphot/src/models/pmModel_STRAIL.c (revision 11702) @@ -333,5 +333,5 @@ 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,5 +353,5 @@ 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,5 +372,5 @@ 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,7 +380,7 @@ 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; } Index: trunk/psphot/src/models/pmModel_TEST1.c =================================================================== --- trunk/psphot/src/models/pmModel_TEST1.c (revision 11583) +++ trunk/psphot/src/models/pmModel_TEST1.c (revision 11702) @@ -76,5 +76,5 @@ 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,5 +93,5 @@ 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,5 +110,5 @@ 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,7 +118,7 @@ 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,6 +201,6 @@ 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); Index: trunk/psphot/src/psphotBlendFit.c =================================================================== --- trunk/psphot/src/psphotBlendFit.c (revision 11583) +++ trunk/psphot/src/psphotBlendFit.c (revision 11702) @@ -27,5 +27,5 @@ 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++) { Index: trunk/psphot/src/psphotChoosePSF.c =================================================================== --- trunk/psphot/src/psphotChoosePSF.c (revision 11583) +++ trunk/psphot/src/psphotChoosePSF.c (revision 11702) @@ -15,5 +15,5 @@ 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,5 +96,5 @@ 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,5 +102,5 @@ 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,5 +247,5 @@ 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); Index: trunk/psphot/src/psphotEnsemblePSF.c =================================================================== --- trunk/psphot/src/psphotEnsemblePSF.c (revision 11583) +++ trunk/psphot/src/psphotEnsemblePSF.c (revision 11702) @@ -34,10 +34,10 @@ 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,5 +161,5 @@ 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,5 +211,5 @@ // 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]; Index: trunk/psphot/src/psphotModelTest.c =================================================================== --- trunk/psphot/src/psphotModelTest.c (revision 11583) +++ trunk/psphot/src/psphotModelTest.c (revision 11702) @@ -33,5 +33,5 @@ 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,10 +45,10 @@ 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,5 +59,5 @@ } modelType = pmModelSetType (modelName); - if (modelType < 0) psAbort ("fitsource", "unknown model %s", modelName); + if (modelType < 0) psAbort("unknown model %s", modelName); } @@ -94,9 +94,9 @@ // 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; Index: trunk/psphot/src/psphotOutput.c =================================================================== --- trunk/psphot/src/psphotOutput.c (revision 11583) +++ trunk/psphot/src/psphotOutput.c (revision 11702) @@ -51,5 +51,5 @@ 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++) { Index: trunk/psphot/src/psphotRadiusChecks.c =================================================================== --- trunk/psphot/src/psphotRadiusChecks.c (revision 11583) +++ trunk/psphot/src/psphotRadiusChecks.c (revision 11702) @@ -40,5 +40,5 @@ 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,5 +57,5 @@ // 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,5 +91,5 @@ // 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 Index: trunk/psphot/src/psphotSkyReplace.c =================================================================== --- trunk/psphot/src/psphotSkyReplace.c (revision 11583) +++ trunk/psphot/src/psphotSkyReplace.c (revision 11702) @@ -9,9 +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 Index: trunk/psphot/src/psphotSourceFits.c =================================================================== --- trunk/psphot/src/psphotSourceFits.c (revision 11583) +++ trunk/psphot/src/psphotSourceFits.c (revision 11702) @@ -34,5 +34,5 @@ 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,7 +67,7 @@ // 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,5 +145,5 @@ // 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,5 +328,5 @@ 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,5 +365,5 @@ 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); Index: trunk/psphot/src/psphotTestPSF.c =================================================================== --- trunk/psphot/src/psphotTestPSF.c (revision 11583) +++ trunk/psphot/src/psphotTestPSF.c (revision 11702) @@ -74,6 +74,6 @@ // 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,5 +95,5 @@ 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"); Index: trunk/psphot/src/psphotWeightBias.c =================================================================== --- trunk/psphot/src/psphotWeightBias.c (revision 11583) +++ trunk/psphot/src/psphotWeightBias.c (revision 11702) @@ -34,8 +34,8 @@ 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++) {