Index: /trunk/psModules/src/objects/pmModelFuncs.h =================================================================== --- /trunk/psModules/src/objects/pmModelFuncs.h (revision 36859) +++ /trunk/psModules/src/objects/pmModelFuncs.h (revision 36860) @@ -110,4 +110,7 @@ typedef psF64 (*pmModelRadius)(const psVector *params, double flux); +// This function returns the FWHM given the supplied sigma (major or minor) +typedef psF64 (*pmModelSetFWHM)(const psVector *params, double sigma); + // This function provides the model guess parameters based on the details of // the given source. Index: /trunk/psModules/src/objects/pmSource.c =================================================================== --- /trunk/psModules/src/objects/pmSource.c (revision 36859) +++ /trunk/psModules/src/objects/pmSource.c (revision 36860) @@ -33,7 +33,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -146,4 +146,5 @@ source->apMagRaw = NAN; source->apRadius = NAN; + source->apNpixels = 0; source->apFlux = NAN; source->apFluxErr = NAN; @@ -237,4 +238,5 @@ source->apMagRaw = in->apMagRaw; source->apRadius = in->apRadius; + source->apNpixels = in->apNpixels; source->apFlux = in->apFlux; source->apFluxErr = in->apFluxErr; @@ -987,5 +989,5 @@ if (!isfinite(oldI0)) return false; - bool useReff = pmModelUseReff (model->type); + bool useReff = model->class->useReff; pmModelParamsToAxes (&axes, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], useReff); Index: /trunk/psModules/src/objects/pmSource.h =================================================================== --- /trunk/psModules/src/objects/pmSource.h (revision 36859) +++ /trunk/psModules/src/objects/pmSource.h (revision 36860) @@ -97,4 +97,5 @@ float apMagRaw; ///< raw mag in given aperture float apRadius; ///< radius for aperture magnitude + int apNpixels; ///< number of unmasked pixels in aperture float apFlux; ///< apFlux corresponding to psfMag or extMag (depending on type) float apFluxErr; ///< apFluxErr corresponding to psfMag or extMag (depending on type) Index: /trunk/psModules/src/objects/pmSourceIO_CMF.c.in =================================================================== --- /trunk/psModules/src/objects/pmSourceIO_CMF.c.in (revision 36859) +++ /trunk/psModules/src/objects/pmSourceIO_CMF.c.in (revision 36860) @@ -37,7 +37,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -142,7 +142,8 @@ @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG", PS_DATA_F32, "magnitude in standard aperture", source->apMag); @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RAW", PS_DATA_F32, "magnitude in reported aperture", source->apMagRaw); - @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS", PS_DATA_F32, "radius used for aperture mags", outputs.apRadius); + @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS", PS_DATA_F32, "radius used for aperture mags", source->apRadius); @>PS1_DV1,>PS1_V3,>PS1_SV1@ psMetadataAdd (row, PS_LIST_TAIL, "AP_FLUX", PS_DATA_F32, "instrumental flux in standard aperture", source->apFlux); @>PS1_DV1,>PS1_V3,>PS1_SV1@ psMetadataAdd (row, PS_LIST_TAIL, "AP_FLUX_SIG", PS_DATA_F32, "aperture flux error", source->apFluxErr); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ psMetadataAdd (row, PS_LIST_TAIL, "AP_NPIX", PS_DATA_S32, "aperture unmasked pixels", source->apNpixels); @extNsigma); + // PSF shape parameters: @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_MAJOR", PS_DATA_F32, "PSF width (major axis)", outputs.psfMajor); @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_MINOR", PS_DATA_F32, "PSF width (minor axis)", outputs.psfMinor); @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA", PS_DATA_F32, "PSF orientation angle", outputs.psfTheta); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_CORE", PS_DATA_F32, "k term if defined", outputs.psfCore); + + // I use a look-up table and linear interpolation to map PSF_MAJOR,PSF_MINOR + PSF_CORE to FWHM values + @>PS1_V4,>PS1_SV2,>PS1_DV3@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_FWHM_MAJ", PS_DATA_F32, "PSF FWHM (major axis)", outputs.psfMajorFWHM); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_FWHM_MIN", PS_DATA_F32, "PSF FWHM (minor axis)", outputs.psfMinorFWHM); + + // psf data quality @ALL@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF", PS_DATA_F32, "PSF coverage/quality factor (bad)", source->pixWeightNotBad); @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF_PERFECT", PS_DATA_F32, "PSF coverage/quality factor (poor)", source->pixWeightNotPoor); @@ -344,4 +353,8 @@ @ALL@ axes.theta = psMetadataLookupF32 (&status, row, "PSF_THETA"); @ALL@ axes.theta = axes.theta * PS_RAD_DEG; + + @>PS1_V4,>PS1_SV2,>PS1_DV3@ if (model->params->n >= PM_PAR_7) { + @>PS1_V4,>PS1_SV2,>PS1_DV3@ PAR[PM_PAR_7] = psMetadataLookupF32 (&status, row, "PSF_CORE"); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ } @ALL@ PAR[PM_PAR_SKY] = psMetadataLookupF32 (&status, row, "SKY"); @@ -383,5 +396,6 @@ @ALL@ source->crNsigma = psMetadataLookupF32 (&status, row, "CR_NSIGMA"); @ALL@ source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA"); - @ALL@ source->apRadius = psMetadataLookupS32 (&status, row, "AP_MAG_RADIUS"); + @ALL@ source->apRadius = psMetadataLookupF32 (&status, row, "AP_MAG_RADIUS"); + @>PS1_V4,>PS1_SV2,>PS1_DV3@ source->apNpixels = psMetadataLookupS32 (&status, row, "AP_NPIX"); // note that some older versions used PSF_PROBABILITY: this was not well defined. @@ -982,5 +996,5 @@ psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_THETA_ERR", 0, "EXT angle err (SXY, isnan)", dPAR[PM_PAR_SXY]); } else { - psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->type); + psEllipseAxes axes = pmPSF_ModelToAxes (PAR, model->class->useReff); psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_WIDTH_MAJ", 0, "EXT width (major axis), length for trail", axes.major); psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_WIDTH_MIN", 0, "EXT width (minor axis), sigma for trail", axes.minor); Index: /trunk/psModules/src/objects/pmSourceOutputs.c =================================================================== --- /trunk/psModules/src/objects/pmSourceOutputs.c (revision 36859) +++ /trunk/psModules/src/objects/pmSourceOutputs.c (revision 36860) @@ -26,7 +26,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -108,17 +108,29 @@ } if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXY]) && isfinite(PAR[PM_PAR_SYY])) { - axes = pmPSF_ModelToAxes (PAR, model->type); + axes = pmPSF_ModelToAxes (PAR, model->class->useReff); outputs->psfMajor = axes.major; outputs->psfMinor = axes.minor; outputs->psfTheta = axes.theta*PS_DEG_RAD; + + // some models (PS1_V1, QGAUSS) have an extra 'core' parameter + outputs->psfCore = NAN; + if (model->type == pmModelClassGetType ("PS_MODEL_PS1_V1")) { + outputs->psfCore = PAR[PM_PAR_7]; + } + if (model->type == pmModelClassGetType ("PS_MODEL_QGAUSS")) { + outputs->psfCore = PAR[PM_PAR_7]; + } + + outputs->psfMajorFWHM = model->class->modelSetFWHM(model->params, axes.major); + outputs->psfMinorFWHM = model->class->modelSetFWHM(model->params, axes.minor); } else { outputs->psfMajor = NAN; outputs->psfMinor = NAN; outputs->psfTheta = NAN; + outputs->psfCore = NAN; } outputs->chisq = model->chisq; outputs->nDOF = model->nDOF; outputs->nPix = model->nPix; - outputs->apRadius = source->apRadius; } else { bool useMoments = pmSourcePositionUseMoments(source); @@ -138,8 +150,8 @@ outputs->psfMinor = NAN; outputs->psfTheta = NAN; + outputs->psfCore = NAN; outputs->chisq = NAN; outputs->nDOF = 0; outputs->nPix = 0; - outputs->apRadius = NAN; } Index: /trunk/psModules/src/objects/pmSourceOutputs.h =================================================================== --- /trunk/psModules/src/objects/pmSourceOutputs.h (revision 36859) +++ /trunk/psModules/src/objects/pmSourceOutputs.h (revision 36860) @@ -26,6 +26,8 @@ float psfMinor; float psfTheta; + float psfCore; + float psfMajorFWHM; + float psfMinorFWHM; float chisq; - float apRadius; int nPix; int nDOF; Index: /trunk/psModules/src/objects/pmSourcePhotometry.c =================================================================== --- /trunk/psModules/src/objects/pmSourcePhotometry.c (revision 36859) +++ /trunk/psModules/src/objects/pmSourcePhotometry.c (revision 36860) @@ -33,7 +33,7 @@ #include "pmMoments.h" #include "pmModelFuncs.h" +#include "pmModelClass.h" #include "pmModel.h" #include "pmModelUtils.h" -#include "pmModelClass.h" #include "pmSourceMasks.h" #include "pmSourceExtendedPars.h" @@ -330,5 +330,5 @@ // measure fitMag - flux = model->modelFlux (model->params); + flux = model->class->modelFlux (model->params); if (flux > 0) { mag = -2.5*log10(flux); @@ -359,6 +359,5 @@ bool status; - int nPix = 0; - status = pmSourcePhotometryAper(&nPix, &source->apMagRaw, &source->apFlux, &source->apFluxErr, model, image, variance, mask, maskVal); + status = pmSourcePhotometryAper(&source->apNpixels, &source->apMagRaw, &source->apFlux, &source->apFluxErr, model, image, variance, mask, maskVal); if (status) { source->mode |= PM_SOURCE_MODE_AP_MAGS; @@ -490,5 +489,5 @@ // for the full model, add all points - value = fabs(model->modelFunc (NULL, params, coord) - sky); + value = fabs(model->class->modelFunc (NULL, params, coord) - sky); modelSum += value; @@ -893,5 +892,5 @@ // for the full model, add all points - float value = model->modelFunc (NULL, params, coord); + float value = model->class->modelFunc (NULL, params, coord); // fprintf (stderr, "%d, %d : %f, %f : %f - %f : %f\n",