Index: trunk/ppImage/src/ppImageOutput.c
===================================================================
--- trunk/ppImage/src/ppImageOutput.c	(revision 5857)
+++ trunk/ppImage/src/ppImageOutput.c	(revision 6064)
@@ -1,29 +1,19 @@
 # include "ppImage.h"
 
-bool ppImageLoop (ppData *data, ppRecipe *options, ppConfig *config) {
+bool ppImageOutput(ppData *data, ppConfig *config)
+{
+    const char *outname = psMetadataLookupStr(NULL, config->arguments, "-output"); // Name of output file
+    psFits *outFile = psFitsOpen(outname, "w"); // File for writing
 
     // Write the output
-    pmFPAWrite(outputFile, input, database);
+    pmFPAWrite(outFile, data->input->fpa, config->database);
+#if 0
     pmFPAWriteMask(input, outputFile);
     pmFPAWriteWeight(input, outputFile);
+#endif
 
-    psLogMsg("phase2", PS_LOG_INFO, "Output completed after %f sec.\n", psTimerMark("phase2"));
+    psFitsClose(outFile);
+    psLogMsg("ppImage", PS_LOG_INFO, "Output completed after %f sec.\n", psTimerMark("ppImage"));
 
-    psFitsClose(outputFile);
-
-    psFree(arguments);
-    psFree(site);
-    psFree(header);
-    psFree(camera);
-    psFree(recipe);
-    psFree(input);
-    psFree(mask);
-    psFree(bias);
-    psFree(dark);
-    psFree(flat);
-    psFree(overscanFit);
-    psFree(overscanStats);
-
-    psLogMsg("phase2", PS_LOG_INFO, "Output completed after %f sec.\n", psTimerMark("phase2"));
     return true;
 }