Index: trunk/psphot/src/psphotDefinePixels.c
===================================================================
--- trunk/psphot/src/psphotDefinePixels.c	(revision 5993)
+++ trunk/psphot/src/psphotDefinePixels.c	(revision 6056)
@@ -2,5 +2,5 @@
 
 bool psphotDefinePixels(pmSource *mySource, 
-			const eamReadout *imdata,
+			const pmReadout *readout,
 			psF32 x, 
 			psF32 y,
@@ -11,9 +11,9 @@
     // Grab a subimage of the original image of size (2 * outerRadius).
     srcRegion = psRegionForSquare (x, y, Radius);
-    srcRegion = psRegionForImage (imdata->image, srcRegion);
+    srcRegion = psRegionForImage (readout->image, srcRegion);
 
-    mySource->pixels = psImageSubset(imdata->image, srcRegion);
-    mySource->weight = psImageSubset(imdata->weight, srcRegion);
-    mySource->mask   = psImageSubset(imdata->mask,  srcRegion);
+    mySource->pixels = psImageSubset(readout->image, srcRegion);
+    mySource->weight = psImageSubset(readout->weight, srcRegion);
+    mySource->mask   = psImageSubset(readout->mask,  srcRegion);
     mySource->region = srcRegion;
 
@@ -22,5 +22,5 @@
 
 bool psphotRedefinePixels(pmSource *mySource, 
-			  const eamReadout *imdata,
+			  const pmReadout *readout,
 			  psF32 x, 
 			  psF32 y,
@@ -34,5 +34,5 @@
     // check to see if new region is completely contained within old region
     newRegion = psRegionForSquare (x, y, Radius);
-    newRegion = psRegionForImage (imdata->image, newRegion);
+    newRegion = psRegionForImage (readout->image, newRegion);
 
     extend = false;
@@ -53,7 +53,7 @@
 	psFree (mySource->mask);
 
-	mySource->pixels = psImageSubset(imdata->image,  newRegion);
-	mySource->weight = psImageSubset(imdata->weight, newRegion);
-	mySource->mask   = psImageSubset(imdata->mask,   newRegion);
+	mySource->pixels = psImageSubset(readout->image,  newRegion);
+	mySource->weight = psImageSubset(readout->weight, newRegion);
+	mySource->mask   = psImageSubset(readout->mask,   newRegion);
 	mySource->region = newRegion;
     }