Index: trunk/psphot/src/psphotSetup.c
===================================================================
--- trunk/psphot/src/psphotSetup.c	(revision 5986)
+++ trunk/psphot/src/psphotSetup.c	(revision 6056)
@@ -7,7 +7,7 @@
 // load or construct the weight 
 
-eamReadout *psphotSetup (psMetadata *config) 
+pmReadout *psphotSetup (psMetadata *config, psMetadata **header) 
 {
-    psMetadata *header = NULL;
+    psMetadata *myHeader;
     psImage *image = NULL;
     psImage *weight = NULL;
@@ -23,7 +23,7 @@
     // setup header template, specify COMMENT and HISTORY as MULTI
     // XXX EAM - shouldn't this be part of the basic FITS concept?
-    header = psMetadataAlloc ();
-    psMetadataAdd (header, PS_LIST_HEAD, "COMMENT", PS_DATA_METADATA_MULTI, "folder for comment", NULL);
-    psMetadataAdd (header, PS_LIST_HEAD, "HISTORY", PS_DATA_METADATA_MULTI, "folder for history", NULL);
+    myHeader = psMetadataAlloc ();
+    psMetadataAdd (myHeader, PS_LIST_HEAD, "COMMENT", PS_DATA_METADATA_MULTI, "folder for comment", NULL);
+    psMetadataAdd (myHeader, PS_LIST_HEAD, "HISTORY", PS_DATA_METADATA_MULTI, "folder for history", NULL);
 
     // read header and image data from INPUT 
@@ -31,5 +31,5 @@
     if (!status) psAbort ("psphot", "input image not specified");
     psFits *file = psFitsOpen (input, "r");
-    header = psFitsReadHeader (header, file);
+    myHeader = psFitsReadHeader (myHeader, file);
     psImage *tmpimage = psFitsReadImage (NULL, file, region, 0);
     image = psImageCopy (NULL, tmpimage, PS_TYPE_F32);
@@ -40,6 +40,6 @@
 
     // grab these values from the approrpiate location (image header if necessary)
-    float RDNOISE  = pmConfigLookupF32 (&status, config, header, "RDNOISE");
-    float GAIN     = pmConfigLookupF32 (&status, config, header, "GAIN");
+    float RDNOISE  = pmConfigLookupF32 (&status, config, myHeader, "RDNOISE");
+    float GAIN     = pmConfigLookupF32 (&status, config, myHeader, "GAIN");
     psMetadataAdd (config, PS_LIST_TAIL, "RDNOISE", PS_DATA_F32 | PS_META_REPLACE, "read noise value used", RDNOISE);
     psMetadataAdd (config, PS_LIST_TAIL, "GAIN",    PS_DATA_F32 | PS_META_REPLACE, "gain value used", GAIN);
@@ -108,5 +108,10 @@
 
     // return image data
-    eamReadout *imdata = eamReadoutAlloc(image, weight, mask, header);
-    return (imdata);
+    pmReadout *readout = pmReadoutAlloc(NULL);
+    readout->image = image;
+    readout->weight = weight;
+    readout->mask = mask;
+
+    *header = myHeader;
+    return (readout);
 }