IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 26772


Ignore:
Timestamp:
Feb 4, 2010, 6:40:11 PM (16 years ago)
Author:
eugene
Message:

fix error messages in various places; fix interactions with pswarp, ppSub and ppStack

Location:
branches/eam_branches/psphot.stack.20100120/src
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/psphot.stack.20100120/src/psphotAddNoise.c

    r26691 r26772  
    2424    for (int i = 0; i < num; i++) {
    2525        if (!psphotAddOrSubNoiseReadout (config, view, "PSPHOT.INPUT", i, recipe, add)) {
    26             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     26            psError (PSPHOT_ERR_CONFIG, false, "failed on to modify noise for PSPHOT.INPUT entry %d", i);
    2727            return false;
    2828        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotApResid.c

    r26748 r26772  
    1919    for (int i = 0; i < num; i++) {
    2020        if (!psphotApResidReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    21             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     21            psError (PSPHOT_ERR_CONFIG, false, "failed to measure aperture residual for PSPHOT.INPUT entry %d", i);
    2222            return false;
    2323        }
    … …  
    352352    psFree (mag);
    353353    psFree (dMag);
    354     return false;
     354    return true;
     355    // this is a quality error, not a programming error
    355356}
    356357

  • branches/eam_branches/psphot.stack.20100120/src/psphotBasicDeblend.c

    r26691 r26772  
    1212    for (int i = 0; i < num; i++) {
    1313        if (!psphotBasicDeblendReadout (config, view, "PSPHOT.INPUT", i)) {
    14             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     14            psError (PSPHOT_ERR_CONFIG, false, "failed on basic deblend analysis for PSPHOT.INPUT entry %d", i);
    1515            return false;
    1616        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotBlendFit.c

    r26748 r26772  
    1616    for (int i = 0; i < num; i++) {
    1717        if (!psphotBlendFitReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    18             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     18            psError (PSPHOT_ERR_CONFIG, false, "failed to fit sources (non-linear) for PSPHOT.INPUT entry %d", i);
    1919            return false;
    2020        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotChoosePSF.c

    r26748 r26772  
    1616    for (int i = 0; i < num; i++) {
    1717        if (!psphotChoosePSFReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    18             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     18            psError (PSPHOT_ERR_CONFIG, false, "failed to choose a psf model for PSPHOT.INPUT entry %d", i);
    1919            return false;
    2020        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotEfficiency.c

    r26748 r26772  
    164164    for (int i = 0; i < num; i++) {
    165165        if (!psphotEfficiencyReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    166             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     166            psError (PSPHOT_ERR_CONFIG, false, "failed to measure detection efficiency for PSPHOT.INPUT entry %d", i);
    167167            return false;
    168168        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotExtendedSourceAnalysis.c

    r26691 r26772  
    2222    for (int i = 0; i < num; i++) {
    2323        if (!psphotExtendedSourceAnalysisReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    24             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     24            psError (PSPHOT_ERR_CONFIG, false, "failed on measure extended source aperture-like parameters for PSPHOT.INPUT entry %d", i);
    2525            return false;
    2626        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotExtendedSourceFits.c

    r26691 r26772  
    2222    for (int i = 0; i < num; i++) {
    2323        if (!psphotExtendedSourceFitsReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    24             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     24            psError (PSPHOT_ERR_CONFIG, false, "failed on to fit extended sources for PSPHOT.INPUT entry %d", i);
    2525            return false;
    2626        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotFitSourcesLinear.c

    r26691 r26772  
    2323    for (int i = 0; i < num; i++) {
    2424        if (!psphotFitSourcesLinearReadout (config, view, "PSPHOT.INPUT", i, final)) {
    25             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     25            psError (PSPHOT_ERR_CONFIG, false, "failed to fit sources (linear) for PSPHOT.INPUT entry %d", i);
    2626            return false;
    2727        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotGuessModels.c

    r26748 r26772  
    1818    for (int i = 0; i < num; i++) {
    1919        if (!psphotGuessModelsReadout (config, view, "PSPHOT.INPUT", i)) {
    20             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     20            psError (PSPHOT_ERR_CONFIG, false, "failed on to guess models for PSPHOT.INPUT entry %d", i);
    2121            return false;
    2222        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotImageQuality.c

    r26748 r26772  
    1919    for (int i = 0; i < num; i++) {
    2020        if (!psphotImageQualityReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    21             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     21            psError (PSPHOT_ERR_CONFIG, false, "failed on to measure image quality for PSPHOT.INPUT entry %d", i);
    2222            return false;
    2323        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotMagnitudes.c

    r26691 r26772  
    1515    for (int i = 0; i < num; i++) {
    1616        if (!psphotMagnitudesReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    17             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     17            psError (PSPHOT_ERR_CONFIG, false, "failed to measure magnitudes for PSPHOT.INPUT entry %d", i);
    1818            return false;
    1919        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotMergeSources.c

    r26748 r26772  
    168168    if (!detections) {
    169169        psLogMsg ("psphot", 3, "no psf sources for this readout");
     170        return NULL;
    170171    }
    171172
    … …  
    173174    if (!sources) {
    174175        psLogMsg ("psphot", 3, "no psf sources for this readout");
     176        return NULL;
    175177    }
    176178
    … …  
    178180}
    179181
     182// this function is used to fix sources which were loaded externally, but have passed from
     183// psphotDetectionsFromSources to psphotSourceStats and are now stored on
     184// detections->newSources.
    180185bool psphotRepairLoadedSources (pmConfig *config, const pmFPAview *view) {
    181186
    … …  
    193198    }
    194199
    195     psArray *sources = detections->allSources;
     200    psArray *sources = detections->newSources;
    196201    psAssert (sources, "missing sources?");
    197202

  • branches/eam_branches/psphot.stack.20100120/src/psphotReadoutFindPSF.c

    r26748 r26772  
    2626    }
    2727
    28     // construct sources and measure basic stats (moments, local sky)
     28    // construct detections->newSources and measure basic stats (moments, local sky)
    2929    if (!psphotSourceStats(config, view, true)) {
    3030        psError(PSPHOT_ERR_UNKNOWN, false, "failure to generate sources");
    … …  
    6060    // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
    6161    psphotGuessModels (config, view);
     62# endif
    6263
     64    // merge the newly selected sources into the existing list
     65    // NOTE: merge OLD and NEW
     66    psphotMergeSources (config, view);
     67
     68# if 0
    6369    // measure aperture photometry corrections
    6470    if (!psphotApResid (config, view)) {

  • branches/eam_branches/psphot.stack.20100120/src/psphotReadoutKnownSources.c

    r26748 r26772  
    5151    psphotGuessModels (config, view);
    5252
     53    // merge the newly selected sources into the existing list
     54    // NOTE: merge OLD and NEW
     55    psphotMergeSources (config, view);
     56
    5357    // linear PSF fit to source peaks
    5458    psphotFitSourcesLinear (config, view, false);

  • branches/eam_branches/psphot.stack.20100120/src/psphotReplaceUnfit.c

    r26691 r26772  
    3737    for (int i = 0; i < num; i++) {
    3838        if (!psphotReplaceAllSourcesReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    39             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     39            psError (PSPHOT_ERR_CONFIG, false, "failed to replace all sources for PSPHOT.INPUT entry %d", i);
    4040            return false;
    4141        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotRoughClass.c

    r26748 r26772  
    2222    for (int i = 0; i < num; i++) {
    2323        if (!psphotRoughClassReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
    24             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     24            psError (PSPHOT_ERR_CONFIG, false, "failed on rough classification for PSPHOT.INPUT entry %d", i);
    2525            return false;
    2626        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotSkyReplace.c

    r26691 r26772  
    1111    for (int i = 0; i < num; i++) {
    1212        if (!psphotSkyReplaceReadout (config, view, "PSPHOT.INPUT", i)) {
    13             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     13            psError (PSPHOT_ERR_CONFIG, false, "failed to replace sky for PSPHOT.INPUT entry %d", i);
    1414            return false;
    1515        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotSourceFreePixels.c

    r26691 r26772  
    1111    for (int i = 0; i < num; i++) {
    1212        if (!psphotSourceFreePixelsReadout (config, view, "PSPHOT.INPUT", i)) {
    13             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     13            psError (PSPHOT_ERR_CONFIG, false, "failed to free source pixels for PSPHOT.INPUT entry %d", i);
    1414            return false;
    1515        }

  • branches/eam_branches/psphot.stack.20100120/src/psphotSourceSize.c

    r26748 r26772  
    4444    for (int i = 0; i < num; i++) {
    4545        if (!psphotSourceSizeReadout (config, view, "PSPHOT.INPUT", i, recipe, getPSFsize)) {
    46             psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
     46            psError (PSPHOT_ERR_CONFIG, false, "failed on source size analysis for PSPHOT.INPUT entry %d", i);
    4747            return false;
    4848        }
Note: See TracChangeset for help on using the changeset viewer.