Index: /branches/eam_branch_20070921/psphot/src/models/pmModel_STRAIL.c
===================================================================
--- /branches/eam_branch_20070921/psphot/src/models/pmModel_STRAIL.c	(revision 14991)
+++ /branches/eam_branch_20070921/psphot/src/models/pmModel_STRAIL.c	(revision 14992)
@@ -530,6 +530,6 @@
  
     for (int i = 4; i < 7; i++) { 
-      psPolynomial2D *poly = psf->params->data[i-4]; 
-	out[i] = psPolynomial2DEval (poly, out[2], out[3]); 
+      pmTrend2D *trend = psf->params->data[i-4]; 
+	out[i] = pmTrend2DEval (trend, out[2], out[3]); 
     } 
     return(true); 
@@ -554,7 +554,6 @@
     for (int i = 0; i < psf->params->n; i++) {
 	if (i == PM_PAR_SKY) continue;
-	psPolynomial2D *poly = psf->params->data[i];
-	assert (poly);
-	PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+	pmTrend2D *trend = psf->params->data[i];
+	PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 
Index: /branches/eam_branch_20070921/psphot/src/models/pmModel_TEST1.c
===================================================================
--- /branches/eam_branch_20070921/psphot/src/models/pmModel_TEST1.c	(revision 14991)
+++ /branches/eam_branch_20070921/psphot/src/models/pmModel_TEST1.c	(revision 14992)
@@ -217,6 +217,6 @@
 	    out[i] = in[i];
 	} else {	    
-	    psPolynomial2D *poly = psf->params->data[i];
-	    out[i] = psPolynomial2DEval(poly, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+	    pmTrend2D *trend = psf->params->data[i];
+	    out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
 	}
     }
@@ -246,7 +246,6 @@
     for (int i = 0; i < psf->params->n; i++) {
 	if (i == PM_PAR_SKY) continue;
-	psPolynomial2D *poly = psf->params->data[i];
-	assert (poly);
-	PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+	pmTrend2D *trend = psf->params->data[i];
+	PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 
Index: /branches/eam_branch_20070921/psphot/src/psphotChoosePSF.c
===================================================================
--- /branches/eam_branch_20070921/psphot/src/psphotChoosePSF.c	(revision 14991)
+++ /branches/eam_branch_20070921/psphot/src/psphotChoosePSF.c	(revision 14992)
@@ -54,5 +54,10 @@
 
     options->stats = psStatsAlloc (PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
-    options->image = psMemIncrRefCounter (readout->image);
+
+    // dimensions of the field for which the PSF is defined
+    options->psfFieldNx = readout->image->numCols;
+    options->psfFieldNy = readout->image->numRows;
+    options->psfFieldXo = readout->image->col0;
+    options->psfFieldYo = readout->image->row0;
 
     pmSourceFitModelInit (15, 0.01, PS_SQR(SKY_SIG), options->poissonErrorsPhotLMM);
@@ -309,4 +314,5 @@
     psLogMsg ("psphot.pspsf", PS_LOG_INFO, "psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
 
+    psFree (options);
     return (psf);
 }