Index: trunk/psModules/src/objects/pmPSFtry.c =================================================================== --- trunk/psModules/src/objects/pmPSFtry.c (revision 10050) +++ trunk/psModules/src/objects/pmPSFtry.c (revision 10075) @@ -5,6 +5,6 @@ * @author EAM, IfA * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-11-16 01:45:50 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-11-18 07:31:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -168,4 +168,5 @@ psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK); status = pmSourceFitModel (source, source->modelPSF, PM_SOURCE_FIT_PSF); + // pmModelSub (source->pixels, source->mask, source->modelPSF, false, false); psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK)); @@ -291,5 +292,5 @@ // XXX test dump of fitted model (dump when tracing?) - if (0) { + if (1) { FILE *f = fopen ("resid.dat", "w"); psVector *apfit = psPolynomial1DEvalVector (poly, r2rflux); @@ -403,5 +404,5 @@ // XXX test dump of star parameters vs position (compare with fitted values) - if (0) { + if (1) { FILE *f = fopen ("params.dat", "w"); Index: trunk/psModules/src/objects/pmSource.c =================================================================== --- trunk/psModules/src/objects/pmSource.c (revision 10050) +++ trunk/psModules/src/objects/pmSource.c (revision 10075) @@ -6,6 +6,6 @@ * @author EAM, IfA: significant modifications. * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-11-17 23:01:30 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-11-18 07:31:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ static void sourceFree(pmSource *tmp) { - psTrace(__func__, 5, "---- begin ----\n"); + psTrace("psModules.objects", 5, "---- begin ----\n"); psFree(tmp->peak); psFree(tmp->pixels); @@ -40,5 +40,5 @@ psFree(tmp->modelEXT); psFree(tmp->blends); - psTrace(__func__, 5, "---- end ----\n"); + psTrace("psModules.objects", 5, "---- end ----\n"); } @@ -65,5 +65,5 @@ pmSource *pmSourceAlloc() { - psTrace(__func__, 5, "---- begin ----\n"); + psTrace("psModules.objects", 5, "---- begin ----\n"); static int id = 1; pmSource *source = (pmSource *) psAlloc(sizeof(pmSource)); @@ -90,5 +90,5 @@ source->pixWeight = NAN; - psTrace(__func__, 5, "---- end ----\n"); + psTrace("psModules.objects", 5, "---- end ----\n"); return(source); } @@ -205,5 +205,5 @@ pmPSFClump pmSourcePSFClump(psArray *sources, psMetadata *recipe) { - psTrace(__func__, 5, "---- begin ----\n"); + psTrace("psModules.objects", 5, "---- begin ----\n"); # define NPIX 10 @@ -291,5 +291,5 @@ stats = psImageStats (stats, splane, NULL, 0); peaks = pmFindImagePeaks (splane, stats[0].max / 2); - psTrace (__func__, 2, "clump threshold is %f\n", stats[0].max/2); + psTrace ("psModules.objects", 2, "clump threshold is %f\n", stats[0].max/2); const bool keep_psf_clump = psMetadataLookupBool(NULL, recipe, "KEEP_PSF_CLUMP"); @@ -323,5 +323,5 @@ psArraySort (peaks, pmPeaksCompareDescend); clump = peaks->data[0]; - psTrace (__func__, 2, "clump is at %d, %d (%f)\n", clump->x, clump->y, clump->counts); + psTrace ("psModules.objects", 2, "clump is at %d, %d (%f)\n", clump->x, clump->y, clump->counts); // define section window for clump @@ -369,6 +369,6 @@ psfClump.dY = stats->clippedStdev; - psTrace (__func__, 2, "clump X, Y: %f, %f\n", psfClump.X, psfClump.Y); - psTrace (__func__, 2, "clump DX, DY: %f, %f\n", psfClump.dX, psfClump.dY); + psTrace ("psModules.objects", 2, "clump X, Y: %f, %f\n", psfClump.X, psfClump.Y); + psTrace ("psModules.objects", 2, "clump DX, DY: %f, %f\n", psfClump.dX, psfClump.dY); // these values should be pushed on the recipe somewhere @@ -379,5 +379,5 @@ } - psTrace(__func__, 5, "---- end ----\n"); + psTrace("psModules.objects", 5, "---- end ----\n"); return (psfClump); } @@ -391,5 +391,5 @@ bool pmSourceRoughClass(psArray *sources, psMetadata *recipe, pmPSFClump clump) { - psTrace(__func__, 5, "---- begin ----"); + psTrace("psModules.objects", 5, "---- begin ----"); psBool rc = true; @@ -498,12 +498,12 @@ psFree (starsn); - psTrace (__func__, 2, "Nstar: %3d\n", Nstar); - psTrace (__func__, 2, "Npsf: %3d\n", Npsf); - psTrace (__func__, 2, "Next: %3d\n", Next); - psTrace (__func__, 2, "Nsatstar: %3d\n", Nsatstar); - psTrace (__func__, 2, "Nsat: %3d\n", Nsat); - psTrace (__func__, 2, "Ncr: %3d\n", Ncr); - - psTrace(__func__, 5, "---- end ----\n"); + psTrace ("psModules.objects", 2, "Nstar: %3d\n", Nstar); + psTrace ("psModules.objects", 2, "Npsf: %3d\n", Npsf); + psTrace ("psModules.objects", 2, "Next: %3d\n", Next); + psTrace ("psModules.objects", 2, "Nsatstar: %3d\n", Nsatstar); + psTrace ("psModules.objects", 2, "Nsat: %3d\n", Nsat); + psTrace ("psModules.objects", 2, "Ncr: %3d\n", Ncr); + + psTrace("psModules.objects", 5, "---- end ----\n"); return(rc); } @@ -531,5 +531,5 @@ psF32 radius) { - psTrace(__func__, 5, "---- begin ----\n"); + psTrace("psModules.objects", 5, "---- begin ----\n"); PS_ASSERT_PTR_NON_NULL(source, false); PS_ASSERT_PTR_NON_NULL(source->peak, false); @@ -637,10 +637,10 @@ // XXX EAM - the limit is a bit arbitrary. make it user defined? if ((numPixels < 0.75*R2) || (Sum <= 0)) { - psTrace (__func__, 3, "no valid pixels for source\n"); - psTrace(__func__, 5, "---- end (false) ----\n"); + psTrace ("psModules.objects", 3, "no valid pixels for source\n"); + psTrace("psModules.objects", 5, "---- end (false) ----\n"); return (false); } - psTrace (__func__, 4, "sky: %f Sum: %f X1: %f Y1: %f X2: %f Y2: %f XY: %f Npix: %d\n", + psTrace ("psModules.objects", 4, "sky: %f Sum: %f X1: %f Y1: %f X2: %f Y2: %f XY: %f Npix: %d\n", sky, Sum, X1, Y1, X2, Y2, XY, numPixels); @@ -653,7 +653,7 @@ y = Y1/Sum; if ((fabs(x) > radius) || (fabs(y) > radius)) { - psTrace (__func__, 3, "large centroid swing; invalid peak %d, %d\n", + psTrace ("psModules.objects", 3, "large centroid swing; invalid peak %d, %d\n", source->peak->x, source->peak->y); - psTrace(__func__, 5, "---- end(false) ----\n"); + psTrace("psModules.objects", 5, "---- end(false) ----\n"); return (false); } @@ -673,10 +673,10 @@ source->moments->Sy = sqrt(PS_MAX(Y2/Sum - PS_SQR(y), 0)); - psTrace (__func__, 4, + psTrace ("psModules.objects", 4, "sky: %f Sum: %f x: %f y: %f Sx: %f Sy: %f Sxy: %f\n", sky, Sum, source->moments->x, source->moments->y, source->moments->Sx, source->moments->Sy, source->moments->Sxy); - psTrace(__func__, 5, "---- end ----\n"); + psTrace("psModules.objects", 5, "---- end ----\n"); return(true); } Index: trunk/psModules/src/objects/pmSourceFitModel.c =================================================================== --- trunk/psModules/src/objects/pmSourceFitModel.c (revision 10050) +++ trunk/psModules/src/objects/pmSourceFitModel.c (revision 10075) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-10-24 22:55:05 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-11-18 07:31:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ pmSourceFitMode mode) { - psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__); + psTrace("psModules.objects", 5, "---- %s() begin ----\n", __func__); PS_ASSERT_PTR_NON_NULL(source, false); PS_ASSERT_PTR_NON_NULL(source->moments, false); @@ -163,6 +163,6 @@ if (nPix < nParams + 1) { - psTrace (".pmObjects.pmSourceFitModel", 4, "insufficient valid pixels\n"); - psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__); + psTrace ("psModules.objects", 4, "insufficient valid pixels\n"); + psTrace ("psModules.objects", 5, "---- %s(false) end ----\n", __func__); model->status = PM_MODEL_BADARGS; psFree (x); @@ -189,12 +189,14 @@ psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F64); - psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n"); + psTrace (__func__, 5, "fitting function\n"); fitStatus = psMinimizeLMChi2(myMin, covar, params, constrain, x, y, yErr, modelFunc); for (int i = 0; i < dparams->n; i++) { + psTrace ("psModules.objects", 4, "%f ", params->data.F32[i]); if ((paramMask != NULL) && paramMask->data.U8[i]) continue; dparams->data.F32[i] = sqrt(covar->data.F64[i][i]); } + psTrace ("psModules.objects", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value); // save the resulting chisq, nDOF, nIter @@ -245,5 +247,5 @@ rc = (onPic && fitStatus); - psTrace("psModules.objects", 3, "---- %s(%d) end ----\n", __func__, rc); + psTrace("psModules.objects", 5, "---- %s(%d) end ----\n", __func__, rc); return(rc); } Index: trunk/psModules/src/objects/pmSourceIO_RAW.c =================================================================== --- trunk/psModules/src/objects/pmSourceIO_RAW.c (revision 10050) +++ trunk/psModules/src/objects/pmSourceIO_RAW.c (revision 10075) @@ -3,6 +3,6 @@ * @author EAM, IfA * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-10-31 19:38:44 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-11-18 07:31:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -267,9 +267,9 @@ if (peak == NULL) continue; - fprintf (f, "%5d %5d %7.1f\n", - peak->x, peak->y, peak->counts); - } - fclose (f); - return true; -} - + fprintf (f, "%5d %5d %7.1f %7.2f %7.2f\n", + peak->x, peak->y, peak->counts, peak->xf, peak->yf); + } + fclose (f); + return true; +} +