Changeset 11702 for trunk/psphot/src

Timestamp:

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

Author:

jhoblitt

Message:

update psAbort() API

Location:

trunk/psphot/src

Files:

• models/pmModel_STRAIL.c (modified) (4 diffs)
• models/pmModel_TEST1.c (modified) (5 diffs)
• psphotBlendFit.c (modified) (1 diff)
• psphotChoosePSF.c (modified) (4 diffs)
• psphotEnsemblePSF.c (modified) (3 diffs)
• psphotModelTest.c (modified) (4 diffs)
• psphotOutput.c (modified) (1 diff)
• psphotRadiusChecks.c (modified) (3 diffs)
• psphotSkyReplace.c (modified) (1 diff)
• psphotSourceFits.c (modified) (5 diffs)
• psphotTestPSF.c (modified) (2 diffs)
• psphotWeightBias.c (modified) (1 diff)

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++) {