Index: /branches/eam_branches/20100225/psphot/src/psphotKernelFromPSF.c
===================================================================
--- /branches/eam_branches/20100225/psphot/src/psphotKernelFromPSF.c	(revision 27491)
+++ /branches/eam_branches/20100225/psphot/src/psphotKernelFromPSF.c	(revision 27492)
@@ -4,8 +4,8 @@
 
     assert (source);
-    assert (source->psfFlux); // XXX build if needed?
+    assert (source->psfImage); // XXX build if needed?
 
-    int x0 = source->peak->xf - source->psfFlux->col0;
-    int y0 = source->peak->yf - source->psfFlux->row0;
+    int x0 = source->peak->xf - source->psfImage->col0;
+    int y0 = source->peak->yf - source->psfImage->row0;
 
     // need to decide on the size: dynamically? statically?
@@ -17,12 +17,12 @@
     // if the realized PSF for this object does not cover the full kernel, give up for now
     if (x0 + psf->xMin < 0) goto escape;
-    if (x0 + psf->xMax >= source->psfFlux->numCols) goto escape;
+    if (x0 + psf->xMax >= source->psfImage->numCols) goto escape;
     if (y0 + psf->yMin < 0) goto escape;
-    if (y0 + psf->yMax >= source->psfFlux->numRows) goto escape;
+    if (y0 + psf->yMax >= source->psfImage->numRows) goto escape;
 
     double sum = 0.0;
     for (int j = psf->yMin; j <= psf->yMax; j++) {
 	for (int i = psf->xMin; i <= psf->xMax; i++) {
-	    double value = source->psfFlux->data.F32[y0 + j][x0 + i];
+	    double value = source->psfImage->data.F32[y0 + j][x0 + i];
 	    psf->kernel[j][i] = value;
 	    sum += value;