Index: trunk/psphot/src/psphotModelTest.c
===================================================================
--- trunk/psphot/src/psphotModelTest.c	(revision 6715)
+++ trunk/psphot/src/psphotModelTest.c	(revision 6727)
@@ -1,7 +1,6 @@
 # include "psphot.h"
-# include "psEllipse.h"
 static char DEFAULT_MODE[] = "EXT";
 
-bool psphotModelTest (pmReadout *readout, recipe) {
+bool psphotModelTest (pmReadout *readout, psMetadata *recipe) {
 
     bool status;
@@ -97,9 +96,9 @@
     fprintf (stderr, "sum: %f @ (%f, %f)\n", source->moments->Sum, source->moments->x, source->moments->y);
 
-    EllipseMoments moments;
+    psEllipseMoments moments;
     moments.x2 = source->moments->Sx;
     moments.y2 = source->moments->Sy;
     moments.xy = source->moments->Sxy;
-    EllipseAxes axes = EllipseMomentsToAxes (moments);
+    psEllipseAxes axes = psEllipseMomentsToAxes (moments);
 
     fprintf (stderr, "axes: %f @ (%f, %f)\n", axes.theta*180/M_PI, axes.major, axes.minor);
@@ -137,9 +136,9 @@
 
     // list model input shape
-    EllipseShape shape;
+    psEllipseShape shape;
     shape.sx  = 1.4 / model->params->data.F32[4];
     shape.sy  = 1.4 / model->params->data.F32[5];
     shape.sxy = model->params->data.F32[6];
-    axes = EllipseShapeToAxes (shape);
+    axes = psEllipseShapeToAxes (shape);
 
     fprintf (stderr, "guess: %f @ (%f, %f)\n", axes.theta*180/M_PI, axes.major, axes.minor);
@@ -152,5 +151,5 @@
 
     // define the pixels used for the fit
-    psImageKeepCircle (source->mask, xObj, yObj, RADIUS, "OR", PSPHOT_MASK_MARKED);
+    psImageKeepCircle (source->mask, xObj, yObj, RADIUS, "OR", PM_SOURCE_MASK_MARKED);
 
     char *fitset = psMetadataLookupStr (&status, recipe, "TEST_FIT_SET");
@@ -163,5 +162,6 @@
 
     // measure the source mags
-    pmSourcePhotometry (&fitMag, &obsMag, model, source->pixels, source->mask);
+    pmSourcePhotometryModel (&fitMag, model);
+    pmSourcePhotometryAper  (&obsMag, model, source->pixels, source->mask);
     fprintf (stderr, "ap: %f, fit: %f, apmifit: %f\n", obsMag, fitMag, obsMag - fitMag);