Index: trunk/psphot/src/psphotModelTest.c
===================================================================
--- trunk/psphot/src/psphotModelTest.c	(revision 6727)
+++ trunk/psphot/src/psphotModelTest.c	(revision 6851)
@@ -10,6 +10,12 @@
     char name[64];
     pmPSF *psf = NULL;
+    pmSourceFitMode fitMode;
 
     psMetadataItem *item  = NULL;
+
+    // use poissonian errors or local-sky errors
+    bool POISSON_ERRORS = psMetadataLookupBool (&status, recipe, "POISSON_ERRORS");
+    if (!status) POISSON_ERRORS = true;
+    pmSourceFitModelInit (15, 0.1, POISSON_ERRORS);
 
     // run model fitting tests on a single source
@@ -17,12 +23,13 @@
 
     // what fitting mode to use?
-    char *psfModeWord = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODE");
+    char *fitModeWord = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODE");
     if (!status) {
-	psfModeWord = DEFAULT_MODE;
+	fitModeWord = DEFAULT_MODE;
     }
-    bool psfMode = !strcasecmp (psfModeWord, "PSF");
+    fitMode = PM_SOURCE_FIT_EXT;
+    if (!strcasecmp (fitModeWord, "PSF")) fitMode = PM_SOURCE_FIT_PSF;
 
-    // in psfMode, psf sets the model type
-    if (psfMode) {
+    // in fitMode, psf sets the model type
+    if (fitMode == PM_SOURCE_FIT_PSF) {
 	char *psfFile = psMetadataLookupStr (&status, recipe, "PSF_INPUT_FILE");
 	if (!status) psAbort ("psphotModelTest", "PSF_INPUT_FILE not supplied");
@@ -128,5 +135,5 @@
     fprintf (stderr, "peak: %f @ (%f, %f)\n", source->moments->Sum*area, (double)source->peak->x, (double)source->peak->y);
 
-    if (psfMode) {
+    if (fitMode == PM_SOURCE_FIT_PSF) {
 	pmModel *modelPSF = pmModelFromPSF (model, psf);
 	psFree (model);
@@ -155,9 +162,9 @@
     char *fitset = psMetadataLookupStr (&status, recipe, "TEST_FIT_SET");
     if (status) {
-	status = psphotFitSet (source, model, fitset, psfMode);
+	status = psphotFitSet (source, model, fitset, fitMode);
 	exit (0);
     }
 
-    status = pmSourceFitModel (source, model, psfMode);
+    status = pmSourceFitModel (source, model, fitMode);
 
     // measure the source mags