Index: trunk/psphot/src/psphotChoosePSF.c
===================================================================
--- trunk/psphot/src/psphotChoosePSF.c	(revision 4946)
+++ trunk/psphot/src/psphotChoosePSF.c	(revision 4949)
@@ -17,5 +17,5 @@
     // select the candidate PSF stars (pointers to original sources)
     for (int i = 0; i < sources->n; i++) {
-	psSource *source = sources->data[i];
+	pmSource *source = sources->data[i];
 	if (source->type != PS_SOURCE_PSFSTAR) continue;
 	psArrayAdd (stars, 200, source);
@@ -35,6 +35,5 @@
 
     // set up an array to store the test results
-    psArray *tests = psArrayAlloc (list->size);
-    // XXX EAM : new value : psArray *tests = psArrayAlloc (list->n);
+    psArray *tests = psArrayAlloc (list->n);
 
     // test each model option listed in config
@@ -68,5 +67,5 @@
     // keep only the selected test:
     test = tests->data[bestN];
-    modelName = psModelGetType (test->modelType);
+    modelName = pmModelGetType (test->modelType);
     psLogMsg ("psphot.pspsf", 3, "selected psf model %s, ApResid: %f +/- %f\n", modelName, test->ApResid, test->dApResid);
 
@@ -77,5 +76,5 @@
     // set source->model based on best psf model fit
     for (int i = 0; i < test->sources->n; i++) {
-	psSource *source = test->sources->data[i];
+	pmSource *source = test->sources->data[i];
 	// drop masked sources from PSFSTAR list
 	if (test->mask->data.U8[i]) {