IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 17, 2014, 12:30:45 PM (12 years ago)
Author:
eugene
Message:

merge changes (from past YEAR) into trunk

Location:
branches/eam_branches/ipp-ops-20130712/psphot
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-ops-20130712/psphot

    • Property svn:mergeinfo deleted

  • branches/eam_branches/ipp-ops-20130712/psphot/src

    • Property svn:ignore

      •  

        old new  
        2424psphotModelTest
        2525psphotMinimal
         26psphotFullForce
         27psmakecff
         28psphotFullForceSummary
    • Property svn:mergeinfo deleted

  • branches/eam_branches/ipp-ops-20130712/psphot/src/psphotStackMatchPSFsNext.c

    r34317 r37066  
    4343    for (int i = 0; i < num; i++) {
    4444        if (!psphotStackMatchPSFsNextReadout (config, view, filerule, i, lastSize)) {
    45             psError (PSPHOT_ERR_CONFIG, false, "failed to smooth image %s (%d) to target PSF", filerule, i);
     45            psLogMsg ("psphot", PS_LOG_INFO, "failed to smooth image %s (%d) to target PSF", filerule, i);
    4646            psImageConvolveSetThreads(oldThreads);
    4747            return false;
    … …  
    102102
    103103    if (targetFWHM <= currentFWHM) {
    104         psError (PSPHOT_ERR_CONFIG, true, "target FWHM cannot be smaller than current FWHM");
     104        // psError (PSPHOT_ERR_CONFIG, true, "target FWHM cannot be smaller than current FWHM");
     105        psLogMsg ("psphot", PS_LOG_INFO, "target FWHM (%f) is smaller than current FWHM (%f), not smoothing\n", targetFWHM, currentFWHM);
     106        fwhmValues->data.F32[lastSize + 1] = currentFWHM;
     107        pmReadoutMaskInvalid(readout, maskVal, maskSat);
    105108        return false;
    106109    }
Note: See TracChangeset for help on using the changeset viewer.