Index: trunk/psModules/test/objects/tap_pmGrowthCurve.c =================================================================== --- trunk/psModules/test/objects/tap_pmGrowthCurve.c (revision 9922) +++ trunk/psModules/test/objects/tap_pmGrowthCurve.c (revision 15726) @@ -3,18 +3,80 @@ #include #include - #include "tap.h" #include "pstap.h" -int main (void) +#define VERBOSE 0 +#define ERR_TRACE_LEVEL 10 + +int main(int argc, char* argv[]) { - pmModelGroupInit (); - - plan_tests(57); - - diag("pmGrowthCurve tests"); - - // test allocation - diag("offset of 0.0,0.0 wrt growth ref source"); + psLogSetFormat("HLNM"); + psLogSetLevel(PS_LOG_INFO); + psTraceSetLevel("err", ERR_TRACE_LEVEL); + plan_tests(15); + + // ---------------------------------------------------------------------- + // pmGrowthCurveAlloc() tests + // call pmGrowthCurveAlloc() with acceptable input parameters. + { + psMemId id = psMemGetId(); + pmGrowthCurve *growthCurve = pmGrowthCurveAlloc(1.0, 2.0, 3.0); + ok(growthCurve && psMemCheckGrowthCurve(growthCurve), "pmGrowthCurveAlloc() allocated a pmGrowthCurve correctly"); + ok(growthCurve->radius && psMemCheckVector(growthCurve->radius), "pmGrowthCurveAlloc() allocated the radius psVector correctly"); + ok(growthCurve->apMag && psMemCheckVector(growthCurve->apMag) && + growthCurve->apMag->n == growthCurve->radius->n, "pmGrowthCurveAlloc() allocated the apMag psVector correctly"); + ok(growthCurve->refRadius == 3.0, "pmGrowthCurveAlloc() set growthCurve->refRadius correctly"); + ok(growthCurve->maxRadius == 2.0, "pmGrowthCurveAlloc() set growthCurve->maxRadius correctly"); + ok(growthCurve->apLoss == 0.0, "pmGrowthCurveAlloc() set growthCurve->apLoss correctly"); + ok(growthCurve->fitMag == 0.0, "pmGrowthCurveAlloc() set growthCurve->fitMag correctly"); + psFree(growthCurve); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // ---------------------------------------------------------------------- + // pmGrowthCurveCorrect() tests + // Call pmGrowthCurveCorrect() with NULL input pmGrowthCurve + { + psMemId id = psMemGetId(); + pmGrowthCurve *growthCurve = pmGrowthCurveAlloc(1.0, 2.0, 3.0); + ok(isnan(pmGrowthCurveCorrect(NULL, 0.0)), "pmGrowthCurveCorrect() returned NAN with NULL input pmGrowthCurve"); + psFree(growthCurve); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + // Call pmGrowthCurveCorrect() with bad type for input pmGrowthCurve arg + // XX: This is commented out for now because we are not asserting, inside + // pmGrowthCurveCorrect(), that input parameters are of the correct type. + if (0) { + psMemId id = psMemGetId(); + pmGrowthCurve *growthCurve = pmGrowthCurveAlloc(1.0, 2.0, 3.0); + psVector *junkVec = psVectorAlloc(10, PS_TYPE_F32); + ok(isnan(pmGrowthCurveCorrect((pmGrowthCurve *) junkVec, 0.0)), "pmGrowthCurveCorrect() returned NAN with NULL input pmGrowthCurve"); + psFree(growthCurve); + psFree(junkVec); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // Call pmGrowthCurveCorrect() with acceptable input parameters. + { + #define RADIUS 0.5 + psMemId id = psMemGetId(); + pmGrowthCurve *growthCurve = pmGrowthCurveAlloc(1.0, 2.0, 3.0); + float testCor = pmGrowthCurveCorrect(growthCurve, RADIUS); + float actRad = psVectorInterpolate (growthCurve->radius, growthCurve->apMag, RADIUS); + float actCor = growthCurve->apRef - actRad; + + ok(!isnan(testCor), "pmGrowthCurveCorrect() call was successful"); + ok(actCor == testCor, "pmGrowthCurveCorrect() calculated the correction correctly"); + + psFree(growthCurve); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // EM test 01: test allocation + // offset of 0.0,0.0 wrt growth ref source { psMemId id = psMemGetId(); @@ -43,8 +105,9 @@ // generate a simple psf - pmPSF *psf = pmPSFBuildSimple ("PS_MODEL_GAUSS", 1.5, 1.5, 0.0); + pmModelClassInit(); + pmPSF *psf = pmPSFBuildSimple("PS_MODEL_GAUSS", 1.5, 1.5, 0.0); psf->growth = growth; - pmGrowthCurveGenerate (readout, psf, false); + pmGrowthCurveGenerate(readout, psf, false, 0, 0); // check ap mags for a few radii set by hand @@ -71,5 +134,5 @@ source->type = PM_SOURCE_TYPE_STAR; source->pixels = psMemIncrRefCounter (readout->image); - source->mask = psMemIncrRefCounter (readout->mask); + source->maskObj = psMemIncrRefCounter (readout->mask); source->modelPSF->dparams->data.F32[PM_PAR_I0] = 1; @@ -77,29 +140,30 @@ source->modelPSF->radiusFit = 15.0; - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); double refMag = source->apMag; source->modelPSF->radiusFit = 10.0; - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); ok_float_tol(refMag - source->apMag, -0.0075, 0.0001, "growth offset is is %f", refMag - source->apMag); @@ -116,6 +180,7 @@ } - // test allocation - diag("offset of 0.2,0.2 wrt growth ref source"); + + // EM test 02: test allocation + // offset of 0.2,0.2 wrt growth ref source { psMemId id = psMemGetId(); @@ -147,5 +212,5 @@ psf->growth = growth; - pmGrowthCurveGenerate (readout, psf, false); + pmGrowthCurveGenerate (readout, psf, false, 0, 0); // check ap mags for a few radii set by hand @@ -172,5 +237,5 @@ source->type = PM_SOURCE_TYPE_STAR; source->pixels = psMemIncrRefCounter (readout->image); - source->mask = psMemIncrRefCounter (readout->mask); + source->maskObj = psMemIncrRefCounter (readout->mask); source->modelPSF->dparams->data.F32[PM_PAR_I0] = 1; @@ -178,29 +243,29 @@ source->modelPSF->radiusFit = 15.0; - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); double refMag = source->apMag; source->modelPSF->radiusFit = 10.0; - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); ok_float_tol(refMag - source->apMag, -0.0103, 0.0001, "growth offset is is %f", refMag - source->apMag); @@ -217,6 +282,7 @@ } - // test allocation - diag("offset of 0.4,0.4 wrt growth ref source"); + + // EM test 03: test allocation + // offset of 0.4,0.4 wrt growth ref source { psMemId id = psMemGetId(); @@ -248,5 +314,5 @@ psf->growth = growth; - pmGrowthCurveGenerate (readout, psf, false); + pmGrowthCurveGenerate(readout, psf, false, 0, 0); // check ap mags for a few radii set by hand @@ -273,5 +339,5 @@ source->type = PM_SOURCE_TYPE_STAR; source->pixels = psMemIncrRefCounter (readout->image); - source->mask = psMemIncrRefCounter (readout->mask); + source->maskObj = psMemIncrRefCounter (readout->mask); source->modelPSF->dparams->data.F32[PM_PAR_I0] = 1; @@ -279,29 +345,29 @@ source->modelPSF->radiusFit = 15.0; - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); double refMag = source->apMag; source->modelPSF->radiusFit = 10.0; - pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); 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); + pmSourceMagnitudes (source, psf, PM_SOURCE_PHOT_GROWTH | PM_SOURCE_PHOT_INTERP, 0, 0); ok_float_tol(refMag - source->apMag, -0.0164, 0.0001, "growth offset is is %f", refMag - source->apMag); @@ -317,5 +383,4 @@ ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); } - - return exit_status(); } +