Index: /trunk/psModules/test/objects/.cvsignore =================================================================== --- /trunk/psModules/test/objects/.cvsignore (revision 9921) +++ /trunk/psModules/test/objects/.cvsignore (revision 9922) @@ -5,2 +5,4 @@ temp tst_pmObjects01 +tap_pmGrowthCurve +tap_pmSourcePhotometry Index: /trunk/psModules/test/objects/tap_pmGrowthCurve.c =================================================================== --- /trunk/psModules/test/objects/tap_pmGrowthCurve.c (revision 9921) +++ /trunk/psModules/test/objects/tap_pmGrowthCurve.c (revision 9922) @@ -5,13 +5,16 @@ #include "tap.h" +#include "pstap.h" int main (void) { - plan_tests(143); + pmModelGroupInit (); + + plan_tests(57); diag("pmGrowthCurve tests"); // test allocation - diag("pmGrowthCurveAlloc tests"); + diag("offset of 0.0,0.0 wrt growth ref source"); { psMemId id = psMemGetId(); @@ -29,5 +32,4 @@ // does the growth curve correctly fix aperture mags? - pmModelGroupInit (); // generate a simple readout @@ -36,4 +38,8 @@ readout->mask = psImageAlloc (64, 64, PS_TYPE_U8); + // create an empty reference image + psImageInit (readout->image, 0.0); + psImageInit (readout->mask, 0); + // generate a simple psf pmPSF *psf = pmPSFBuildSimple ("PS_MODEL_GAUSS", 1.5, 1.5, 0.0); @@ -43,12 +49,12 @@ // check ap mags for a few radii set by hand - ok_float(growth->apMag->data.F32[0], 0.0, "apMag at radius 0: %f", growth->apMag->data.F32[0]); - ok_float(growth->apMag->data.F32[3], 0.0, "apMag at radius 3: %f", growth->apMag->data.F32[3]); - ok_float(growth->apMag->data.F32[10], 0.0, "apMag at radius 10: %f", growth->apMag->data.F32[10]); - ok_float(growth->apMag->data.F32[30], 0.0, "apMag at radius 30: %f", growth->apMag->data.F32[30]); - - ok_float(growth->apRef, 0.0, "apMag at ref radius : %f", growth->apRef); + ok_float_tol(growth->apMag->data.F32[0], -9.7805, 0.0001, "apMag at radius 0: %f", growth->apMag->data.F32[0]); + ok_float_tol(growth->apMag->data.F32[3], -10.3722, 0.0001, "apMag at radius 3: %f", growth->apMag->data.F32[3]); + ok_float_tol(growth->apMag->data.F32[10], -10.3759, 0.0001, "apMag at radius 10: %f", growth->apMag->data.F32[10]); + ok_float_tol(growth->apMag->data.F32[30], -10.3759, 0.0001, "apMag at radius 30: %f", growth->apMag->data.F32[30]); + + ok_float_tol(growth->apRef, -10.3759, 0.0001, "apMag at ref radius : %f", growth->apRef); + ok_float_tol(growth->fitMag, -10.3759, 0.0001, "fitMag : %f", growth->fitMag); ok_float(growth->apLoss, 0.0, "apLoss : %f", growth->apLoss); - ok_float(growth->fitMag, 0.0, "fitMag : %f", growth->fitMag); // create template model and measure apMag at fractional offsets @@ -60,7 +66,76 @@ modelRef->params->data.F32[PM_PAR_YPOS] = 32.5; - // create modelPSF from this model - pmModel *model = pmModelFromPSF (modelRef, psf); - model->radiusFit = radius; + // measure growth-corrected photometry: + pmSource *source = pmSourceAlloc (); + source->modelPSF = pmModelFromPSF (modelRef, psf); + source->type = PM_SOURCE_TYPE_STAR; + source->pixels = psMemIncrRefCounter (readout->image); + source->mask = psMemIncrRefCounter (readout->mask); + + source->modelPSF->dparams->data.F32[PM_PAR_I0] = 1; + source->mode = PM_SOURCE_MODE_SUBTRACTED; + + source->modelPSF->radiusFit = 15.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + double refMag = source->apMag; + + source->modelPSF->radiusFit = 10.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0000, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 8.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0000, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 6.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0003, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 4.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0020, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 3.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, -0.0001, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 2.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, -0.0075, 0.0001, "growth offset is is %f", refMag - source->apMag); + + // XXX include some apertures outside of growth correction range + + psFree(modelRef); + psFree(source); + psFree(readout); + psFree(psf); + + skip_end(); + + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + // test allocation + diag("offset of 0.2,0.2 wrt growth ref source"); + { + psMemId id = psMemGetId(); + + pmGrowthCurve *growth = pmGrowthCurveAlloc (2.0, 100.0, 15.0); + + ok(growth != NULL, "growth curve allocated"); + skip_start(growth == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed"); + + ok(growth->radius->n == (100.0 - 2.0), "correct number of growth radii"); + ok(growth->apMag->n == (100.0 - 2.0), "correct number of growth apMags"); + + ok_float(growth->refRadius, 15.0, "correct refRadius"); + ok_float(growth->maxRadius, 100.0, "correct maxRadius"); + + // does the growth curve correctly fix aperture mags? + + // generate a simple readout + pmReadout *readout = pmReadoutAlloc (NULL); + readout->image = psImageAlloc (64, 64, PS_TYPE_F32); + readout->mask = psImageAlloc (64, 64, PS_TYPE_U8); // create an empty reference image @@ -68,59 +143,179 @@ psImageInit (readout->mask, 0); - // we generate a subtracted model, pmSourceMagnitude will insert and remove it - // pmModelAdd (readout->image, readout->mask, model, false, false); + // generate a simple psf + pmPSF *psf = pmPSFBuildSimple ("PS_MODEL_GAUSS", 1.5, 1.5, 0.0); + psf->growth = growth; + + pmGrowthCurveGenerate (readout, psf, false); + + // check ap mags for a few radii set by hand + ok_float_tol(growth->apMag->data.F32[0], -9.7805, 0.0001, "apMag at radius 0: %f", growth->apMag->data.F32[0]); + ok_float_tol(growth->apMag->data.F32[3], -10.3722, 0.0001, "apMag at radius 3: %f", growth->apMag->data.F32[3]); + ok_float_tol(growth->apMag->data.F32[10], -10.3759, 0.0001, "apMag at radius 10: %f", growth->apMag->data.F32[10]); + ok_float_tol(growth->apMag->data.F32[30], -10.3759, 0.0001, "apMag at radius 30: %f", growth->apMag->data.F32[30]); + + ok_float_tol(growth->apRef, -10.3759, 0.0001, "apMag at ref radius : %f", growth->apRef); + ok_float_tol(growth->fitMag, -10.3759, 0.0001, "fitMag : %f", growth->fitMag); + ok_float(growth->apLoss, 0.0, "apLoss : %f", growth->apLoss); + + // create template model and measure apMag at fractional offsets + // XXX note model is at 0.5,0.5 subpix center + pmModel *modelRef = pmModelAlloc(psf->type); + modelRef->params->data.F32[PM_PAR_SKY] = 0; + modelRef->params->data.F32[PM_PAR_I0] = 1000; + modelRef->params->data.F32[PM_PAR_XPOS] = 32.3; + modelRef->params->data.F32[PM_PAR_YPOS] = 32.3; // measure growth-corrected photometry: pmSource *source = pmSourceAlloc (); - source->modelPSF = model; + source->modelPSF = pmModelFromPSF (modelRef, psf); source->type = PM_SOURCE_TYPE_STAR; - source->pixels = readout->image; - source->mask = readout->mask; + source->pixels = psMemIncrRefCounter (readout->image); + source->mask = psMemIncrRefCounter (readout->mask); source->modelPSF->dparams->data.F32[PM_PAR_I0] = 1; - source->mode = PM_SOURCE_SUBTRACTED; - - source->modelPSF->radiusFit = 10.0 - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); - - ok_float_tol(source->fitMag, -10.0, 0.1, "source fitMag is %f", source->fitMag); - ok_float_tol(source->apMag, -10.0, 0.1, "source apMag is %f", source->apMag); - ok_float_tol(source->errMag, 0.1, 0.01, "source errMag is %f", source->errMag); - - source->modelPSF->radiusFit = 8.0 - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); - - ok_float_tol(source->fitMag, -10.0, 0.1, "source fitMag is %f", source->fitMag); - ok_float_tol(source->apMag, -10.0, 0.1, "source apMag is %f", source->apMag); - ok_float_tol(source->errMag, 0.1, 0.01, "source errMag is %f", source->errMag); - - source->modelPSF->radiusFit = 6.0 - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); - - ok_float_tol(source->fitMag, -10.0, 0.1, "source fitMag is %f", source->fitMag); - ok_float_tol(source->apMag, -10.0, 0.1, "source apMag is %f", source->apMag); - ok_float_tol(source->errMag, 0.1, 0.01, "source errMag is %f", source->errMag); - - source->modelPSF->radiusFit = 4.0 - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); - - ok_float_tol(source->fitMag, -10.0, 0.1, "source fitMag is %f", source->fitMag); - ok_float_tol(source->apMag, -10.0, 0.1, "source apMag is %f", source->apMag); - ok_float_tol(source->errMag, 0.1, 0.01, "source errMag is %f", source->errMag); - - source->modelPSF->radiusFit = 2.0 - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); - - ok_float_tol(source->fitMag, -10.0, 0.1, "source fitMag is %f", source->fitMag); - ok_float_tol(source->apMag, -10.0, 0.1, "source apMag is %f", source->apMag); - ok_float_tol(source->errMag, 0.1, 0.01, "source errMag is %f", source->errMag); + source->mode = PM_SOURCE_MODE_SUBTRACTED; + + source->modelPSF->radiusFit = 15.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + double refMag = source->apMag; + + source->modelPSF->radiusFit = 10.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0000, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 8.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0000, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 6.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0004, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 4.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0026, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 3.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, -0.0001, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 2.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, -0.0103, 0.0001, "growth offset is is %f", refMag - source->apMag); // XXX include some apertures outside of growth correction range + psFree(modelRef); + psFree(source); + psFree(readout); + psFree(psf); + skip_end(); - psFree(growth); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } + // test allocation + diag("offset of 0.4,0.4 wrt growth ref source"); + { + psMemId id = psMemGetId(); + + pmGrowthCurve *growth = pmGrowthCurveAlloc (2.0, 100.0, 15.0); + + ok(growth != NULL, "growth curve allocated"); + skip_start(growth == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed"); + + ok(growth->radius->n == (100.0 - 2.0), "correct number of growth radii"); + ok(growth->apMag->n == (100.0 - 2.0), "correct number of growth apMags"); + + ok_float(growth->refRadius, 15.0, "correct refRadius"); + ok_float(growth->maxRadius, 100.0, "correct maxRadius"); + + // does the growth curve correctly fix aperture mags? + + // generate a simple readout + pmReadout *readout = pmReadoutAlloc (NULL); + readout->image = psImageAlloc (64, 64, PS_TYPE_F32); + readout->mask = psImageAlloc (64, 64, PS_TYPE_U8); + + // create an empty reference image + psImageInit (readout->image, 0.0); + psImageInit (readout->mask, 0); + + // generate a simple psf + pmPSF *psf = pmPSFBuildSimple ("PS_MODEL_GAUSS", 1.5, 1.5, 0.0); + psf->growth = growth; + + pmGrowthCurveGenerate (readout, psf, false); + + // check ap mags for a few radii set by hand + ok_float_tol(growth->apMag->data.F32[0], -9.7805, 0.0001, "apMag at radius 0: %f", growth->apMag->data.F32[0]); + ok_float_tol(growth->apMag->data.F32[3], -10.3722, 0.0001, "apMag at radius 3: %f", growth->apMag->data.F32[3]); + ok_float_tol(growth->apMag->data.F32[10], -10.3759, 0.0001, "apMag at radius 10: %f", growth->apMag->data.F32[10]); + ok_float_tol(growth->apMag->data.F32[30], -10.3759, 0.0001, "apMag at radius 30: %f", growth->apMag->data.F32[30]); + + ok_float_tol(growth->apRef, -10.3759, 0.0001, "apMag at ref radius : %f", growth->apRef); + ok_float_tol(growth->fitMag, -10.3759, 0.0001, "fitMag : %f", growth->fitMag); + ok_float(growth->apLoss, 0.0, "apLoss : %f", growth->apLoss); + + // create template model and measure apMag at fractional offsets + // XXX note model is at 0.5,0.5 subpix center + pmModel *modelRef = pmModelAlloc(psf->type); + modelRef->params->data.F32[PM_PAR_SKY] = 0; + modelRef->params->data.F32[PM_PAR_I0] = 1000; + modelRef->params->data.F32[PM_PAR_XPOS] = 32.1; + modelRef->params->data.F32[PM_PAR_YPOS] = 32.1; + + // measure growth-corrected photometry: + pmSource *source = pmSourceAlloc (); + source->modelPSF = pmModelFromPSF (modelRef, psf); + source->type = PM_SOURCE_TYPE_STAR; + source->pixels = psMemIncrRefCounter (readout->image); + source->mask = psMemIncrRefCounter (readout->mask); + + source->modelPSF->dparams->data.F32[PM_PAR_I0] = 1; + source->mode = PM_SOURCE_MODE_SUBTRACTED; + + source->modelPSF->radiusFit = 15.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + double refMag = source->apMag; + + source->modelPSF->radiusFit = 10.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0000, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 8.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0000, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 6.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0006, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 4.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0038, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 3.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, +0.0000, 0.0001, "growth offset is is %f", refMag - source->apMag); + + source->modelPSF->radiusFit = 2.0; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, -0.0164, 0.0001, "growth offset is is %f", refMag - source->apMag); + + // XXX include some apertures outside of growth correction range + + psFree(modelRef); + psFree(source); + psFree(readout); + psFree(psf); + + skip_end(); + + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + return exit_status(); } Index: /trunk/psModules/test/objects/tap_pmSourcePhotometry.c =================================================================== --- /trunk/psModules/test/objects/tap_pmSourcePhotometry.c (revision 9921) +++ /trunk/psModules/test/objects/tap_pmSourcePhotometry.c (revision 9922) @@ -5,4 +5,7 @@ #include "tap.h" +#include "pstap.h" + +bool pmSourcePhotometry_TestOffsets (double radius, double sigma, double fitMag, double apMag, double err1, double err2); int main (void) @@ -11,80 +14,154 @@ pmModelGroupInit (); - plan_tests(143); + plan_tests(240); diag("pmSourcePhotometry tests"); - // test allocation, free of pmShutterCorrPars - { - psMemId id = psMemGetId(); + // test consistency of interpolated photometry for a range of apertures (for a fixed PSF sigma) + pmSourcePhotometry_TestOffsets (15.0, 2.0, -10.3759, -10.3759, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets (10.0, 2.0, -10.3759, -10.3759, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets ( 8.0, 2.0, -10.3759, -10.3759, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets ( 7.0, 2.0, -10.3759, -10.3759, +0.0000, +0.0001); + pmSourcePhotometry_TestOffsets ( 6.0, 2.0, -10.3759, -10.3758, +0.0001, +0.0004); + pmSourcePhotometry_TestOffsets ( 5.0, 2.0, -10.3759, -10.3733, +0.0003, +0.0011); + pmSourcePhotometry_TestOffsets ( 4.0, 2.0, -10.3759, -10.3520, +0.0006, +0.0018); + pmSourcePhotometry_TestOffsets ( 3.0, 2.0, -10.3759, -10.2626, +0.0001, +0.0002); + pmSourcePhotometry_TestOffsets ( 2.0, 2.0, -10.3759, -9.7729, -0.0027, -0.0089); + pmSourcePhotometry_TestOffsets ( 1.0, 2.0, -10.3759, -8.8689, -0.0051, -0.0161); - diag("pmSourcePhotometry basic tests"); + // test consistency of interpolated photometry for a range of apertures (for a fixed PSF sigma) + pmSourcePhotometry_TestOffsets (15.0, 1.5, -10.3759, -10.3759, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets (10.0, 1.5, -10.3759, -10.3759, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets ( 8.0, 1.5, -10.3759, -10.3759, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets ( 7.0, 1.5, -10.3759, -10.3759, +0.0000, +0.0001); + pmSourcePhotometry_TestOffsets ( 6.0, 1.5, -10.3759, -10.3758, +0.0001, +0.0004); + pmSourcePhotometry_TestOffsets ( 5.0, 1.5, -10.3759, -10.3733, +0.0003, +0.0011); + pmSourcePhotometry_TestOffsets ( 4.0, 1.5, -10.3759, -10.3520, +0.0006, +0.0018); + pmSourcePhotometry_TestOffsets ( 3.0, 1.5, -10.3759, -10.2626, +0.0001, +0.0002); + pmSourcePhotometry_TestOffsets ( 2.0, 1.5, -10.3759, -9.7729, -0.0027, -0.0089); + pmSourcePhotometry_TestOffsets ( 1.0, 1.5, -10.3759, -8.8689, -0.0051, -0.0161); - // generate a simple readout - pmReadout *readout = pmReadoutAlloc (NULL); - readout->image = psImageAlloc (64, 64, PS_TYPE_F32); - readout->mask = psImageAlloc (64, 64, PS_TYPE_U8); - - // create an empty reference image - psImageInit (readout->image, 0.0); - psImageInit (readout->mask, 0); - - // generate a simple psf - pmPSF *psf = pmPSFBuildSimple ("PS_MODEL_GAUSS", 1.5, 1.5, 0.0); - - // create a source - pmSource *source = pmSourceAlloc (); - source->pixels = readout->image; - source->mask = readout->mask; - source->type = PM_SOURCE_TYPE_STAR; - source->mode = PM_SOURCE_SUBTRACTED; - - // create template model and measure apMag at fractional offsets - pmModel *modelRef = pmModelAlloc(psf->type); - modelRef->params->data.F32[PM_PAR_SKY] = 0; - modelRef->params->data.F32[PM_PAR_I0] = 1000; - modelRef->params->data.F32[PM_PAR_XPOS] = 32.5; - modelRef->params->data.F32[PM_PAR_YPOS] = 32.5; - - // create modelPSF from this model - source->modelPSF = pmModelFromPSF (modelRef, psf); - source->modelPSF->radiusFit = radius; - source->modelPSF->dparams->data.F32[PM_PAR_I0] = 1; - source->modelPSF->radiusFit = 10.0 - - // measure growth-corrected photometry: - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); - - ok_float_tol(source->fitMag, -10.0, 0.1, "source fitMag is %f", source->fitMag); - ok_float_tol(source->apMag, -10.0, 0.1, "source apMag is %f", source->apMag); - ok_float_tol(source->errMag, 0.1, 0.01, "source errMag is %f", source->errMag); - float refMag = source->apMag; - - // use a sub-pixel offset position - source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.3; - source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.3; - - // measure growth-corrected photometry: - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); - ok_float_tol(refMag - source->apMag, 0.0, 0.1, "source apMag is %f", source->apMag); - - psFree (source); - psFree (model); - - psFree (modelRef); - psFree (psf); - psFree (readout); - - ok(pars != NULL, "pmShutterCorrPars successfully allocated"); - skip_start(pars == NULL, 0, "Skipping tests because pmShutterCorrParsAlloc() failed"); - skip_end(); - - skip_end(); - - psFree(growth); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - + // test consistency of interpolated photometry for a range of apertures (for a fixed PSF sigma) + pmSourcePhotometry_TestOffsets (15.0, 1.0, -9.4955, -9.4955, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets (10.0, 1.0, -9.4955, -9.4955, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets ( 8.0, 1.0, -9.4955, -9.4955, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets ( 7.0, 1.0, -9.4955, -9.4955, +0.0000, +0.0000); + pmSourcePhotometry_TestOffsets ( 6.0, 1.0, -9.4955, -9.4955, +0.0000, +0.0001); + pmSourcePhotometry_TestOffsets ( 5.0, 1.0, -9.4955, -9.4955, +0.0001, +0.0002); + pmSourcePhotometry_TestOffsets ( 4.0, 1.0, -9.4955, -9.4968, +0.0006, +0.0022); + pmSourcePhotometry_TestOffsets ( 3.0, 1.0, -9.4955, -9.4945, +0.0021, +0.0068); + pmSourcePhotometry_TestOffsets ( 2.0, 1.0, -9.4955, -9.3323, -0.0034, -0.0118); + pmSourcePhotometry_TestOffsets ( 1.0, 1.0, -9.4955, -8.6844, -0.0141, -0.0440); return exit_status(); } + +bool pmSourcePhotometry_TestOffsets (double radius, double sigma, double fitMag, double apMag, double err1, double err2) +{ + psMemId id = psMemGetId(); + + diag("pmSourcePhotometry test offsets for radius %f", radius); + + // generate a simple readout + pmReadout *readout = pmReadoutAlloc (NULL); + skip_start(readout == NULL, 0, "Skipping tests because pmReadoutAlloc failed"); + + readout->image = psImageAlloc (64, 64, PS_TYPE_F32); + readout->mask = psImageAlloc (64, 64, PS_TYPE_U8); + + // create an empty reference image + psImageInit (readout->image, 0.0); + psImageInit (readout->mask, 0); + + // generate a simple psf + pmPSF *psf = pmPSFBuildSimple ("PS_MODEL_GAUSS", sigma, sigma, 0.0); + // psf->growth = pmGrowthCurveAlloc (2.0, 100.0, 15.0); + // pmGrowthCurveGenerate (readout, psf, false); + + // create a source + pmSource *source = pmSourceAlloc (); + source->pixels = psMemIncrRefCounter (readout->image); + source->mask = psMemIncrRefCounter (readout->mask); + source->type = PM_SOURCE_TYPE_STAR; + source->mode = PM_SOURCE_MODE_SUBTRACTED; + + // create template model and measure apMag at fractional offsets + pmModel *modelRef = pmModelAlloc(psf->type); + modelRef->params->data.F32[PM_PAR_SKY] = 0; + modelRef->params->data.F32[PM_PAR_I0] = 1000; + modelRef->params->data.F32[PM_PAR_XPOS] = 32.5; + modelRef->params->data.F32[PM_PAR_YPOS] = 32.5; + + // create modelPSF from this model + source->modelPSF = pmModelFromPSF (modelRef, psf); + source->modelPSF->dparams->data.F32[PM_PAR_I0] = 1; + source->modelPSF->radiusFit = radius; + + // measure photometry for centered source (fractional pix : 0.5,0.5) + // pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(source->psfMag, fitMag, 0.0002, "source fitMag is %f", source->psfMag); + ok_float_tol(source->apMag, apMag, 0.0002, "source apMag is %f", source->apMag); + ok_float(source->errMag, 0.001, "source errMag is %f", source->errMag); + float refMag = source->apMag; + + // these use an offset of 0.2,0.2 + // measure photometry for a sub-pixel offset position + source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.3; + source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.3; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, err1, 0.0002, "offset error is %f", refMag - source->apMag); + + // measure photometry for a sub-pixel offset position + source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.7; + source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.3; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, err1, 0.0002, "offset error is %f", refMag - source->apMag); + + // measure photometry for a sub-pixel offset position + source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.3; + source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.7; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, err1, 0.0002, "offset error is %f", refMag - source->apMag); + + // measure photometry for a sub-pixel offset position + source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.7; + source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.7; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, err1, 0.0002, "offset error is %f", refMag - source->apMag); + + // these use an offset of 0.4,0.4 + // measure photometry for a sub-pixel offset position + source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.1; + source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.1; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, err2, 0.0002, "offset error is %f", refMag - source->apMag); + + // measure photometry for a sub-pixel offset position + source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.9; + source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.1; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, err2, 0.0002, "offset error is %f", refMag - source->apMag); + + // measure photometry for a sub-pixel offset position + source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.1; + source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.9; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, err2, 0.0002, "offset error is %f", refMag - source->apMag); + + // measure photometry for a sub-pixel offset position + source->modelPSF->params->data.F32[PM_PAR_XPOS] = 32.9; + source->modelPSF->params->data.F32[PM_PAR_YPOS] = 32.9; + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_INTERP); + ok_float_tol(refMag - source->apMag, err2, 0.0002, "offset error is %f", refMag - source->apMag); + + psFree (source); + psFree (modelRef); + psFree (psf); + psFree (readout); + + skip_end(); + + ok(!psMemCheckLeaks (id, NULL, stdout, false), "no memory leaks"); + return true; +} Index: /trunk/psModules/test/pstap/.cvsignore =================================================================== --- /trunk/psModules/test/pstap/.cvsignore (revision 9922) +++ /trunk/psModules/test/pstap/.cvsignore (revision 9922) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /trunk/psModules/test/pstap/src/.cvsignore =================================================================== --- /trunk/psModules/test/pstap/src/.cvsignore (revision 9922) +++ /trunk/psModules/test/pstap/src/.cvsignore (revision 9922) @@ -0,0 +1,6 @@ +Makefile +Makefile.in +libpstap.la +pstap.lo +.deps +.libs Index: /trunk/psModules/test/pstap/src/Makefile.am =================================================================== --- /trunk/psModules/test/pstap/src/Makefile.am (revision 9921) +++ /trunk/psModules/test/pstap/src/Makefile.am (revision 9922) @@ -9,5 +9,4 @@ $(top_builddir)/src/libpsmodules.la \ $(top_builddir)/test/tap/src/libtap.la \ - $(top_builddir)/test/pstap/src/libpstap.la \ $(PSMODULES_LIBS)