Index: branches/ipp-magic-v0/ppSub/src/ppSubReadout.c
===================================================================
--- branches/bills_081204/ppSub/src/ppSubReadout.c	(revision 20890)
+++ branches/ipp-magic-v0/ppSub/src/ppSubReadout.c	(revision 21062)
@@ -434,4 +434,10 @@
         }
 
+        // Record the FWHM
+        pmHDU *hdu = pmHDUFromCell(outRO->parent); // HDU with header
+        psMetadataItemSupplement(hdu->header, psphotRecipe, "FWHM_MAJ");
+        psMetadataItemSupplement(hdu->header, psphotRecipe, "FWHM_MIN");
+
+
         pmCell *photCell = pmFPAfileThisCell(config->files, view, "PSPHOT.INPUT");
         pmCellFreeReadouts(photCell);
@@ -449,4 +455,18 @@
 
     outRO->data_exists = outCell->data_exists = outCell->parent->data_exists = true;
+
+    // Copy astrometry over
+    // It should get into the output images and photometry
+    pmFPA *refFPA = refRO->parent->parent->parent; // Reference FPA
+    pmHDU *refHDU = refFPA->hdu;        // Reference HDU
+    if (!outHDU || !refHDU) {
+        psWarning("Unable to find HDU at FPA level to copy astrometry.");
+    } else if (!pmAstromReadWCS(outFPA, outCell->parent, refHDU->header, 1.0)) {
+        psWarning("Unable to read WCS astrometry from reference FPA.");
+        psErrorClear();
+    } else if (!pmAstromWriteWCS(outHDU->header, outFPA, outCell->parent, WCS_TOLERANCE)) {
+        psWarning("Unable to write WCS astrometry to output FPA.");
+        psErrorClear();
+    }
 
 #if 0
@@ -532,5 +552,5 @@
         // The PSF should already be stored for the readout
         pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT");
-        pmFPACopy(photFile->fpa, outRO->parent->parent->parent);
+        pmFPACopy(photFile->fpa, outFPA);
 
         pmReadout *psfRO = pmFPAfileThisReadout(config->files, view, "PSPHOT.PSF.LOAD");
@@ -657,19 +677,4 @@
     }
 
-    // Copy astrometry over
-    pmFPA *refFPA = refRO->parent->parent->parent; // Reference FPA
-    pmHDU *refHDU = refFPA->hdu;        // Reference HDU
-    if (!outHDU || !refHDU) {
-        psWarning("Unable to find HDU at FPA level to copy astrometry.");
-    } else {
-        if (!pmAstromReadWCS(outFPA, outCell->parent, refHDU->header, 1.0)) {
-            psWarning("Unable to read WCS astrometry from reference FPA.");
-            psErrorClear();
-        } else if (!pmAstromWriteWCS(outHDU->header, outFPA, outCell->parent, WCS_TOLERANCE)) {
-            psWarning("Unable to write WCS astrometry to output FPA.");
-            psErrorClear();
-        }
-    }
-
     // Add additional data to the header
     pmFPAfile *refFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.REF"); // Reference file