Index: /branches/eam_branch_20080324/psphot/src/psphotPSFConvModel.c
===================================================================
--- /branches/eam_branch_20080324/psphot/src/psphotPSFConvModel.c	(revision 17352)
+++ /branches/eam_branch_20080324/psphot/src/psphotPSFConvModel.c	(revision 17353)
@@ -1,3 +1,4 @@
 # include "psphotInternal.h"
+# define USE_DELTA_PSF 0
 
 // save as static values so they may be set externally
@@ -16,26 +17,6 @@
     psKernel *psf = psphotKernelFromPSF (source, psfSize);
 
-    // psf must be normalized (integral = 1.0)
-    double sum = 0.0;
-    for (int i = 0; i < psf->image->numRows; i++) {
-	for (int j = 0; j < psf->image->numCols; j++) {
-	    sum += psf->image->data.F32[i][j];
-	}
-    }
-    assert (sum > 0.0);
-    for (int i = 0; i < psf->image->numRows; i++) {
-	for (int j = 0; j < psf->image->numCols; j++) {
-	    psf->image->data.F32[i][j] /= sum;
-	}
-    }
-
-# define USE_DELTA_PSF 1
 # if (USE_DELTA_PSF)
-    // XXX sanity check: convolve with delta function should behave like unconvolved version
-    for (int i = 0; i < psf->image->numRows; i++) {
-	for (int j = 0; j < psf->image->numCols; j++) {
-	    psf->image->data.F32[i][j] = 0.0;
-	}
-    }
+    psImageInit (psf->image, 0.0);
     psf->image->data.F32[(int)(0.5*psf->image->numRows)][(int)(0.5*psf->image->numCols)] = 1.0;
 # endif
@@ -44,7 +25,4 @@
     // XXX we could modify the parameter values or even the model 
     // here based on the observed seeing (some lookup table...)
-
-    // XXX we previously required the unconvolved version to have been fit first
-    // pmModel *modelConv = pmModelCopy (source->modelEXT);
 
     // use the source moments, etc to guess basic model parameters