Index: /branches/bills_branches/bills_201312/psastro/src/psastroDataSave.c
===================================================================
--- /branches/bills_branches/bills_201312/psastro/src/psastroDataSave.c	(revision 36426)
+++ /branches/bills_branches/bills_201312/psastro/src/psastroDataSave.c	(revision 36427)
@@ -42,8 +42,9 @@
     }
 
-    // de-activate all files except PSASTRO.OUTPUT
+    // de-activate all files except PSASTRO.OUTPUT, PSASTRO.OUT.ASTROM, and PSPHOT.OUTPUT.CFF
     pmFPAfileActivate (config->files, false, NULL);
     pmFPAfileActivate (config->files, true, "PSASTRO.OUTPUT");
     pmFPAfileActivate (config->files, true, "PSASTRO.OUT.ASTROM");
+    pmFPAfileActivate (config->files, true, "PSPHOT.OUTPUT.CFF");
 
     pmFPAview *view = pmFPAviewAlloc (0);
@@ -103,7 +104,8 @@
     }
 
-    // activate all files except PSASTRO.OUTPUT
+    // activate all files except PSASTRO.OUTPUT, and PSPHOT.OUTPUT.CFF
     pmFPAfileActivate (config->files, true, NULL);
     pmFPAfileActivate (config->files, false, "PSASTRO.OUTPUT");
+    pmFPAfileActivate (config->files, false, "PSPHOT.OUTPUT.CFF");
 
     psFree (view);
Index: /branches/bills_branches/bills_201312/psastro/src/psastroDefineFiles.c
===================================================================
--- /branches/bills_branches/bills_201312/psastro/src/psastroDefineFiles.c	(revision 36426)
+++ /branches/bills_branches/bills_201312/psastro/src/psastroDefineFiles.c	(revision 36427)
@@ -100,4 +100,18 @@
     }
 
+    bool writeCff = psMetadataLookupBool (&status, recipe, "PSASTRO.SAVE.CFF");
+    if (writeCff) {
+	pmFPAfile *file = pmFPAfileDefineOutputFromFile  (config, input, "PSPHOT.OUTPUT.CFF");
+	if (!file) {
+	    psError (PS_ERR_IO, false, "Can't find the output cff file definition");
+	    return NULL;
+	}
+	if (file->type != PM_FPA_FILE_CFF) {
+	    psError(PS_ERR_IO, true, "%s is not of type %s", "PSPHOT.OUTPUT.CFF", pmFPAfileStringFromType (PM_FPA_FILE_CFF));
+	    return NULL;
+	}
+	file->save = true;
+    }
+
 
 # if (0)