Index: branches/eam_branches/ipp-20100621/psphot/src/psphot.h =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphot.h (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphot.h (revision 28643) @@ -211,9 +211,9 @@ bool psphotInitLimitsPSF (psMetadata *recipe, pmReadout *readout); bool psphotInitLimitsEXT (psMetadata *recipe); -bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal); -bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal); -bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal); -pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal); -psArray *psphotFitDBL (pmReadout *readout, pmSource *source, psImageMaskType maskVal, psImageMaskType markVal); +bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal); +bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal); +bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal); +pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal); +psArray *psphotFitDBL (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal); // functions to support simultaneous multi-source fitting @@ -252,4 +252,5 @@ bool psphotVisualShowBackground (pmConfig *config, const pmFPAview *view, pmReadout *readout); bool psphotVisualShowSignificance (psImage *image, float min, float max); +bool psphotVisualShowLogSignificance (psImage *image, float min, float max); bool psphotVisualShowPeaks (pmDetections *detections); bool psphotVisualShowFootprints (pmDetections *detections); Index: branches/eam_branches/ipp-20100621/psphot/src/psphotBlendFit.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotBlendFit.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotBlendFit.c (revision 28643) @@ -75,5 +75,10 @@ // Define source fitting parameters for extended source fits - pmSourceFitModelInit(fitIter, fitTol, PS_SQR(skySig), poisson); + pmSourceFitOptions *fitOptions = pmSourceFitOptionsAlloc(); + fitOptions->nIter = fitIter; + fitOptions->tol = fitTol; + fitOptions->poissonErrors = poisson; + fitOptions->weight = PS_SQR(skySig); + fitOptions->mode = PM_SOURCE_FIT_PSF; psphotInitLimitsPSF (recipe, readout); @@ -88,4 +93,5 @@ if (!sources->n) { psLogMsg ("psphot", PS_LOG_INFO, "no sources, skipping blend"); + psFree (fitOptions); return true; } @@ -112,4 +118,5 @@ psArrayAdd(job->args, 1, psf); psArrayAdd(job->args, 1, newSources); // return for new sources + psArrayAdd(job->args, 1, fitOptions); // default fit options psFree (newSources); @@ -121,31 +128,7 @@ if (!psThreadJobAddPending(job)) { psError(PS_ERR_UNKNOWN, false, "Unable to guess model."); + psFree (fitOptions); return NULL; } - -# if (0) - { - int nfit = 0; - int npsf = 0; - int next = 0; - int nfail = 0; - psArray *newSources = psArrayAllocEmpty(16); - - if (!psphotBlendFit_Unthreaded (&nfit, &npsf, &next, &nfail, readout, recipe, cells->data[j], psf, newSources)) { - psError(PS_ERR_UNKNOWN, false, "Unable to guess model."); - return NULL; - } - Nfit += nfit; - Npsf += npsf; - Next += next; - Nfail += nfail; - - // add these back onto sources - for (int k = 0; k < newSources->n; k++) { - psArrayAdd (sources, 16, newSources->data[k]); - } - psFree (newSources); - } -# endif } @@ -153,4 +136,5 @@ if (!psThreadPoolWait (false)) { psError(PS_ERR_UNKNOWN, false, "Unable to guess model."); + psFree (fitOptions); return NULL; } @@ -163,11 +147,11 @@ } else { psScalar *scalar = NULL; - scalar = job->args->data[5]; + scalar = job->args->data[6]; Nfit += scalar->data.S32; - scalar = job->args->data[6]; + scalar = job->args->data[7]; Npsf += scalar->data.S32; - scalar = job->args->data[7]; + scalar = job->args->data[8]; Next += scalar->data.S32; - scalar = job->args->data[8]; + scalar = job->args->data[9]; Nfail += scalar->data.S32; @@ -186,4 +170,5 @@ psphotSaveImage (NULL, readout->image, "image.v2.fits"); } + psFree (fitOptions); psLogMsg ("psphot.psphotBlendFit", PS_LOG_INFO, "fit models: %f sec for %d objects (%d psf, %d ext, %d failed, %ld skipped)\n", psTimerMark ("psphot.fit.nonlinear"), Nfit, Npsf, Next, Nfail, sources->n - Nfit); @@ -204,9 +189,10 @@ psScalar *scalar = NULL; - pmReadout *readout = job->args->data[0]; - psMetadata *recipe = job->args->data[1]; - psArray *sources = job->args->data[2]; - pmPSF *psf = job->args->data[3]; - psArray *newSources = job->args->data[4]; + pmReadout *readout = job->args->data[0]; + psMetadata *recipe = job->args->data[1]; + psArray *sources = job->args->data[2]; + pmPSF *psf = job->args->data[3]; + psArray *newSources = job->args->data[4]; + pmSourceFitOptions *fitOptions = job->args->data[5]; // bit-masks to test for good/bad pixels @@ -269,8 +255,14 @@ Nfit ++; + if (0) { + psF32 Mxx = source->moments->Mxx; + psF32 Myy = source->moments->Myy; + fprintf (stderr, "1: Mxx: %f, Myy: %f\n", Mxx, Myy); + } + // try fitting PSFs or extended sources depending on source->mode // these functions subtract the resulting fitted source if (source->mode & PM_SOURCE_MODE_EXT_LIMIT) { - if (psphotFitBlob (readout, source, newSources, psf, maskVal, markVal)) { + if (psphotFitBlob (readout, source, newSources, psf, fitOptions, maskVal, markVal)) { source->type = PM_SOURCE_TYPE_EXTENDED; psTrace ("psphot", 5, "source at %7.1f, %7.1f is ext", source->peak->xf, source->peak->yf); @@ -280,5 +272,5 @@ } } else { - if (psphotFitBlend (readout, source, psf, maskVal, markVal)) { + if (psphotFitBlend (readout, source, psf, fitOptions, maskVal, markVal)) { source->type = PM_SOURCE_TYPE_STAR; psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->peak->xf, source->peak->yf); @@ -289,4 +281,10 @@ } + if (0) { + psF32 Mxx = source->moments->Mxx; + psF32 Myy = source->moments->Myy; + fprintf (stderr, "2: Mxx: %f, Myy: %f\n", Mxx, Myy); + } + psTrace ("psphot", 5, "source at %7.1f, %7.1f failed", source->peak->xf, source->peak->yf); Nfail ++; @@ -298,14 +296,14 @@ // change the value of a scalar on the array (wrap this and put it in psArray.h) - scalar = job->args->data[5]; + scalar = job->args->data[6]; scalar->data.S32 = Nfit; - scalar = job->args->data[6]; + scalar = job->args->data[7]; scalar->data.S32 = Npsf; - scalar = job->args->data[7]; + scalar = job->args->data[8]; scalar->data.S32 = Next; - scalar = job->args->data[8]; + scalar = job->args->data[9]; scalar->data.S32 = Nfail; Index: branches/eam_branches/ipp-20100621/psphot/src/psphotChoosePSF.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotChoosePSF.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotChoosePSF.c (revision 28643) @@ -74,5 +74,5 @@ // structure to store user options defining the psf - pmPSFOptions *options = pmPSFOptionsAlloc (); + pmPSFOptions *options = pmPSFOptionsAlloc(); // load user options from the recipe. no need to check existence -- they are @@ -143,6 +143,13 @@ return false; } - pmSourceFitModelInit(fitIter, fitTol, PS_SQR(SKY_SIG), options->poissonErrorsPhotLMM); - + + // options which modify the behavior of the model fitting + options->fitOptions = pmSourceFitOptionsAlloc(); + options->fitOptions->nIter = fitIter; + options->fitOptions->tol = fitTol; + options->fitOptions->poissonErrors = options->poissonErrorsPhotLMM; + options->fitOptions->weight = PS_SQR(SKY_SIG); + options->fitOptions->mode = PM_SOURCE_FIT_PSF; + psArray *stars = psArrayAllocEmpty (sources->n); Index: branches/eam_branches/ipp-20100621/psphot/src/psphotExtendedSourceFits.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotExtendedSourceFits.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotExtendedSourceFits.c (revision 28643) @@ -129,4 +129,13 @@ sources = psArraySort (sources, pmSourceSortBySN); + // Define source fitting parameters for extended source fits + pmSourceFitOptions *fitOptions = pmSourceFitOptionsAlloc(); + fitOptions->mode = PM_SOURCE_FIT_EXT; + // XXX for now, use the defaults for the rest: + // fitOptions->nIter = fitIter; + // fitOptions->tol = fitTol; + // fitOptions->poissonErrors = poisson; + // fitOptions->weight = PS_SQR(skySig); + // choose the sources of interest for (int i = 0; i < sources->n; i++) { @@ -215,5 +224,5 @@ psFree (source->modelFlux); source->modelFlux = NULL; - modelFit = psphotFitEXT (readout, source, modelType, maskVal, markVal); + modelFit = psphotFitEXT (readout, source, fitOptions, modelType, maskVal, markVal); if (!modelFit) { psTrace ("psphot", 5, "failed to fit plain model for object at %f, %f", source->moments->Mx, source->moments->My); @@ -311,4 +320,5 @@ } } + psFree (fitOptions); psLogMsg ("psphot", PS_LOG_INFO, "extended source analysis: %f sec for %d objects\n", psTimerMark ("psphot"), Next); Index: branches/eam_branches/ipp-20100621/psphot/src/psphotFindDetections.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotFindDetections.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotFindDetections.c (revision 28643) @@ -90,10 +90,6 @@ psphotVisualShowSignificance (significance, -1.0, PS_SQR(3.0*NSIGMA_PEAK)); - // XXX getting some strange results from significance image - if (0) { - psImage *lsig = (psImage *) psUnaryOp (NULL, significance, "log"); - psphotVisualShowSignificance (lsig, 0.0, 4.0); - psFree (lsig); - } + // display the log significance image + psphotVisualShowLogSignificance (significance, 0.0, 4.5); // detect the peaks in the significance image Index: branches/eam_branches/ipp-20100621/psphot/src/psphotFitSet.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotFitSet.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotFitSet.c (revision 28643) @@ -24,6 +24,15 @@ } + // Define source fitting parameters for extended source fits + pmSourceFitOptions *fitOptions = pmSourceFitOptionsAlloc(); + fitOptions->mode = PM_SOURCE_FIT_EXT; + // XXX for now, use the defaults for the rest: + // fitOptions->nIter = fitIter; + // fitOptions->tol = fitTol; + // fitOptions->poissonErrors = poisson; + // fitOptions->weight = PS_SQR(skySig); + // XXX pmSourceFitSet must cache the modelFlux? - pmSourceFitSet (source, modelSet, mode, maskVal); + pmSourceFitSet (source, modelSet, fitOptions, maskVal); // write out positive object Index: branches/eam_branches/ipp-20100621/psphot/src/psphotReadout.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotReadout.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotReadout.c (revision 28643) @@ -53,6 +53,7 @@ } - // load the psf model, if suppled. FWHM_X,FWHM_Y,etc are determined and saved on - // readout->analysis XXX this function currently only works with a single PSPHOT.INPUT + // load the psf model, if suppled. FWHM_MAJ,FWHM_MIN,etc are determined and saved on + // readout->analysis. XXX Note: this function currently only works with a single + // PSPHOT.INPUT if (!psphotLoadPSF (config, view)) { // ??? need to supply 2 ? psError (PSPHOT_ERR_UNKNOWN, false, "error loading psf model"); Index: branches/eam_branches/ipp-20100621/psphot/src/psphotSetThreads.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotSetThreads.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotSetThreads.c (revision 28643) @@ -30,5 +30,5 @@ psFree(task); - task = psThreadTaskAlloc("PSPHOT_BLEND_FIT", 9); + task = psThreadTaskAlloc("PSPHOT_BLEND_FIT", 10); task->function = &psphotBlendFit_Threaded; psThreadTaskAdd(task); Index: branches/eam_branches/ipp-20100621/psphot/src/psphotSourceFits.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotSourceFits.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotSourceFits.c (revision 28643) @@ -2,5 +2,4 @@ // given a source with an existing modelPSF, attempt a full PSF fit, subtract if successful -// XXX this function does not call pmSourceFitModelInit : fix this? static int NfitPSF = 0; @@ -22,7 +21,9 @@ } -bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal) { +bool psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal) { float x, y, dR; + + pmSourceFitOptions options = *fitOptions; // maskVal is used to test for rejected pixels, and must include markVal @@ -31,5 +32,5 @@ // if this source is not a possible blend, just fit as PSF if ((source->blends == NULL) || (source->mode & PM_SOURCE_MODE_SATSTAR)) { - bool status = psphotFitPSF (readout, source, psf, maskVal, markVal); + bool status = psphotFitPSF (readout, source, psf, fitOptions, maskVal, markVal); return status; } @@ -91,5 +92,6 @@ // fit PSF model - pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF, maskVal); + options.mode = PM_SOURCE_FIT_PSF; + pmSourceFitSet (source, modelSet, &options, maskVal); // clear the circular mask @@ -154,7 +156,8 @@ } -bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal) { +bool psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal) { double chiTrend; + pmSourceFitOptions options = *fitOptions; // maskVal is used to test for rejected pixels, and must include markVal @@ -171,5 +174,6 @@ // fit PSF model (set/unset the pixel mask) - pmSourceFitModel (source, PSF, PM_SOURCE_FIT_PSF, maskVal); + options.mode = PM_SOURCE_FIT_PSF; + pmSourceFitModel (source, PSF, &options, maskVal); if (!isfinite(PSF->params->data.F32[PM_PAR_I0])) psAbort("nan in fit"); @@ -213,5 +217,5 @@ } -bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *newSources, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal) { +bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *newSources, pmPSF *psf, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal) { bool okEXT, okDBL; @@ -246,5 +250,5 @@ // XXX need to handle failures better here - EXT = psphotFitEXT (readout, source, modelTypeEXT, maskVal, markVal); + EXT = psphotFitEXT (readout, source, fitOptions, modelTypeEXT, maskVal, markVal); if (!EXT) goto escape; if (!isfinite(EXT->params->data.F32[PM_PAR_I0])) goto escape; @@ -254,5 +258,5 @@ // DBL will always be defined, but DBL->data[n] might not - DBL = psphotFitDBL (readout, source, maskVal, markVal); + DBL = psphotFitDBL (readout, source, fitOptions, maskVal, markVal); if (!DBL) goto escape; if (!DBL->n) goto escape; @@ -379,5 +383,5 @@ // fit a double PSF source to an extended blob -psArray *psphotFitDBL (pmReadout *readout, pmSource *source, psImageMaskType maskVal, psImageMaskType markVal) { +psArray *psphotFitDBL (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal) { float dx, dy; @@ -387,4 +391,6 @@ psEllipseMoments moments; psArray *modelSet; + + pmSourceFitOptions options = *fitOptions; NfitDBL ++; @@ -426,9 +432,12 @@ // fit PSF model (set/unset the pixel mask) - pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF, maskVal); + options.mode = PM_SOURCE_FIT_PSF; + pmSourceFitSet (source, modelSet, &options, maskVal); return (modelSet); } -pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal) { +pmModel *psphotFitEXT (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal) { + + pmSourceFitOptions options = *fitOptions; NfitEXT ++; @@ -436,4 +445,6 @@ // maskVal is used to test for rejected pixels, and must include markVal maskVal |= markVal; + + psTraceSetLevel("psLib.math.psMinimizeLMChi2", 5); // use the source moments, etc to guess basic model parameters @@ -448,6 +459,28 @@ } + // for sersic models, get the initial guess more carefully + // if (modelType == pmModelClassGetType("PS_MODEL_SERSIC")) { + // psphotGuessSersic (); + // // test and return NULL on failure? + // } + // fit EXT (not PSF) model (set/unset the pixel mask) - pmSourceFitModel (source, EXT, PM_SOURCE_FIT_EXT, maskVal); + options.mode = PM_SOURCE_FIT_EXT; + pmSourceFitModel (source, EXT, &options, maskVal); + + psTraceSetLevel("psLib.math.psMinimizeLMChi2", 0); return (EXT); } + +// A sersic model is very sensitive to the index. attempt to find the index first by grid search in just the index +// bool psphotFitSersic (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal) { +// +// assert (model->type == pmModelClassGetType("PS_MODEL_SERSIC")); +// +// +// +// if (!model->modelGuess(model, source)) { +// } +// +// +// } Index: branches/eam_branches/ipp-20100621/psphot/src/psphotSourceSize.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotSourceSize.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotSourceSize.c (revision 28643) @@ -1,4 +1,6 @@ # include "psphotInternal.h" # include + +# define KRON 1 typedef struct { @@ -197,5 +199,10 @@ pmSourceSub (source, PM_MODEL_OP_FULL, options->maskVal); + // XXX test: switch to kron flux +# if (KRON) + float apMag = -2.5*log10(source->moments->KronFlux); +# else float apMag = -2.5*log10(source->moments->Sum); +# endif float dMag = source->psfMag - apMag; @@ -343,12 +350,21 @@ pmSourceSub (source, PM_MODEL_OP_FULL, options->maskVal); +# if (KRON) + float apMag = -2.5*log10(source->moments->KronFlux); +# else float apMag = -2.5*log10(source->moments->Sum); +# endif float dMag = source->psfMag - apMag; // set nSigma to include both systematic and poisson error terms // XXX the 'poisson error' contribution for size is probably wrong... - float nSigmaMAG = (dMag - options->ApResid) / hypot(source->errMag, options->ApSysErr); + // XXX add in a hard floor on the Ap Sys Err (to be a bit generous) + float nSigmaMAG = (dMag - options->ApResid) / hypot(source->errMag, hypot(options->ApSysErr, 0.025)); float nSigmaMXX = (Mxx - psfClump->X) / hypot(psfClump->dX, psfClump->X*psfClump->X*source->errMag); float nSigmaMYY = (Myy - psfClump->Y) / hypot(psfClump->dY, psfClump->Y*psfClump->Y*source->errMag); + + fprintf (stderr, "Mxx: %f, Myy: %f, dx: %f, dy: %f, psfMag: %f, apMag: %f, dMag: %f, errMag: %f, nSigmaMag: %f\n", + Mxx, Myy, source->peak->xf - source->moments->Mx, source->peak->yf - source->moments->My, + source->psfMag, apMag, dMag, source->errMag, nSigmaMAG); // partially-masked sources are more likely to be mis-measured PSFs Index: branches/eam_branches/ipp-20100621/psphot/src/psphotSourceStats.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotSourceStats.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotSourceStats.c (revision 28643) @@ -1,3 +1,4 @@ # include "psphotInternal.h" +void pmSourceMomentsSetVerbose(bool state); // convert detections to sources and measure their basic properties (moments, local sky, sky @@ -369,4 +370,6 @@ maskVal |= markVal; + // XXX test : pmSourceMomentsSetVerbose(true); + // threaded measurement of the sources moments int Nfail = 0; @@ -408,4 +411,17 @@ // measure basic source moments (no S/N clipping on input pixels) status = pmSourceMoments (source, RADIUS, SIGMA, 0.0, maskVal); + // XXX moments / aperture test: + if (0) { + // clear the mask bit and set the circular mask pixels + psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal)); + psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, 4.0*source->moments->Mrf, "OR", markVal); + + float apMag = NAN; + pmSourcePhotometryAper (&apMag, NULL, source->pixels, source->maskObj, maskVal); + fprintf (stderr, "apMag: %f, kronMag: %f\n", apMag, -2.5*log10(source->moments->KronFlux)); + + // clear the mask bit + psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal)); + } if (status) { Nmoments ++; Index: branches/eam_branches/ipp-20100621/psphot/src/psphotVisual.c =================================================================== --- branches/eam_branches/ipp-20100621/psphot/src/psphotVisual.c (revision 28440) +++ branches/eam_branches/ipp-20100621/psphot/src/psphotVisual.c (revision 28643) @@ -228,4 +228,19 @@ psphotVisualRangeImage (kapa, image, "signif", 2, min, max); + + pmVisualAskUser(NULL); + return true; +} + +bool psphotVisualShowLogSignificance (psImage *image, float min, float max) { + + if (!pmVisualTestLevel("psphot.image.logsignif", 3)) return true; + + int kapa = psphotKapaChannel (1); + if (kapa == -1) return false; + + psImage *lsig = (psImage *) psUnaryOp (NULL, image, "log"); + psphotVisualRangeImage (kapa, lsig, "log-signif", 2, min, max); + psFree (lsig); pmVisualAskUser(NULL);