Changeset 36427

Timestamp:

Jan 7, 2014, 11:43:24 AM (13 years ago)

Author:

bills

Message:

optionally save a CFF file

Location:

branches/bills_branches/bills_201312/psastro/src

Files:

• psastroDataSave.c (modified) (2 diffs)
• psastroDefineFiles.c (modified) (1 diff)

branches/bills_branches/bills_201312/psastro/src/psastroDataSave.c

@@ -42 +42 @@
     }
 
-    // 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 +104 @@
     }
 
-    // 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);

branches/bills_branches/bills_201312/psastro/src/psastroDefineFiles.c

@@ -100 +100 @@
     }
 
+    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)