Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 4977)
+++ trunk/psphot/src/psphot.h	(revision 5049)
@@ -13,18 +13,18 @@
     psImage *image;
     psImage *mask;
-    psImage *noise;
+    psImage *weight;
     psMetadata *header;
-} psImageData;
+} eamReadout;
 
 // top-level psphot functions
 psMetadata  *psphotArguments (int *argc, char **argv);
-psImageData *psphotSetup (psMetadata *config);
-psStats     *psphotImageStats (psImageData *imdata, psMetadata *config);
-psArray     *pmPeaksSigmaLimit (psImageData *imdata, psMetadata *config, psStats *sky);
-psArray     *psphotSourceStats (psImageData *imdata, psMetadata *config, psArray *allpeaks);
+eamReadout  *psphotSetup (psMetadata *config);
+psStats     *psphotImageStats (eamReadout *imdata, psMetadata *config);
+psArray     *pmPeaksSigmaLimit (eamReadout *imdata, psMetadata *config, psStats *sky);
+psArray     *psphotSourceStats (eamReadout *imdata, psMetadata *config, psArray *allpeaks);
 pmPSF       *psphotChoosePSF (psMetadata *config, psArray *sources, psStats *sky);
-bool         psphotApplyPSF (psImageData *imdata, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky);
-bool         psphotFitGalaxies (psImageData *imdata, psMetadata *config, psArray *sources, psStats *skyStats);
-void         psphotOutput (psImageData *imdata, psMetadata *config, psArray *sources);
+bool         psphotApplyPSF (eamReadout *imdata, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky);
+bool         psphotFitGalaxies (eamReadout *imdata, psMetadata *config, psArray *sources, psStats *skyStats);
+void         psphotOutput (eamReadout *imdata, psMetadata *config, psArray *sources);
 
 bool         psphotMarkPSF (pmSource *source, float shapeNsigma, float minSN, float maxChi, float SATURATE);
@@ -32,15 +32,15 @@
 int 	     psphotSortBySN (const void **a, const void **b);
 int          psphotSaveImage (psMetadata *header, psImage *image, char *filename);
-bool 	     psphotDefinePixels (pmSource *mySource, const psImageData *imdata, psF32 x, psF32 y, psF32 Radius);
+bool 	     psphotDefinePixels (pmSource *mySource, const eamReadout *imdata, psF32 x, psF32 y, psF32 Radius);
 
-// psImageData functions
-psImageData *psImageDataAlloc (psImage *image, psImage *noise, psImage *mask, psMetadata *header);
+// eamReadout functions
+eamReadout *eamReadoutAlloc (psImage *image, psImage *noise, psImage *mask, psMetadata *header);
 
 // output functions
-bool 	     pmSourcesWriteText (psImageData *imdata, char *filename, psArray *sources);
-bool 	     pmSourcesWriteOBJ (psImageData *imdata, char *filename, psArray *sources);
-bool 	     pmSourcesWriteCMP (psImageData *imdata, char *filename, psArray *sources);
-bool 	     pmSourcesWriteCMF (psImageData *imdata, char *filename, psArray *sources);
-bool 	     pmSourcesWriteSX (psImageData *imdata, char *filename, psArray *sources);
+bool 	     pmSourcesWriteText (eamReadout *imdata, char *filename, psArray *sources);
+bool 	     pmSourcesWriteOBJ (eamReadout *imdata, char *filename, psArray *sources);
+bool 	     pmSourcesWriteCMP (eamReadout *imdata, char *filename, psArray *sources);
+bool 	     pmSourcesWriteCMF (eamReadout *imdata, char *filename, psArray *sources);
+bool 	     pmSourcesWriteSX (eamReadout *imdata, char *filename, psArray *sources);
 int  	     pmSourcesDophotType (pmSource *source);
 bool 	     pmPeaksWriteText (psArray *sources, char *filename);