Changeset 17157 for branches/pap_branch_080320/ppMerge/src/ppMergeCamera.c

Timestamp:

Mar 27, 2008, 2:59:07 PM (18 years ago)

Author:

Paul Price

Message:

Adding count and sigma files as outputs.

File:

• branches/pap_branch_080320/ppMerge/src/ppMergeCamera.c (modified) (5 diffs)

branches/pap_branch_080320/ppMerge/src/ppMergeCamera.c

@@ -5 +5 @@
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 #include <pslib.h>
 #include <psmodules.h>
@@ -10 +11 @@
 #include "ppMerge.h"
 
+// Define an output file, with its own FPA
+bool outputFile(pmConfig *config,       // Configuration
+                const char *name,       // Name of output file
+                pmFPAfileType type,     // Type of file
+                const char *description, // Description of file
+                psMetadata *format,     // Camera format
+                pmFPAview *view         // View for PHU
+    )
+{
+    assert(config);
+    assert(name && strlen(name) > 0);
+    assert(view);
+
+    // Output image
+    pmFPA *fpa = pmFPAConstruct(config->camera); // FPA to contain the output
+    if (!fpa) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");
+        return false;
+    }
+
+    pmFPAfile *output = pmFPAfileDefineOutput(config, fpa, name);
+    psFree(fpa);                        // Drop reference
+    if (!output) {
+        psError(PS_ERR_IO, false, "Unable to generate output file from %s", name);
+        return false;
+    }
+    if (output->type != type) {
+        psError(PS_ERR_IO, true, "%s is not of type %s", name, pmFPAfileStringFromType(type));
+        return false;
+    }
+    output->save = true;
+
+    if (!pmFPAAddSourceFromView(fpa, description, view, format)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
+        return false;
+    }
+
+    return true;
+}
 
 
@@ -191 +231 @@
                     psFree(cell->concepts);
                     cell->concepts = NULL;
+                    cell->data_exists = false;
+                    cell->file_exists = false;
                     culled++;
                 }
@@ -197 +239 @@
                 psFree(chip->concepts);
                 chip->concepts = NULL;
+                chip->data_exists = false;
+                chip->file_exists = false;
             }
         }
@@ -256 +300 @@
     }
 
-    pmFPAfile *output = pmFPAfileDefineOutput(config, fpa, outName);
-    psFree(fpa);                        // Drop reference
-    if (!output) {
-        psError(PS_ERR_IO, false, _("Unable to generate output file from %s"), outName);
+    if (!outputFile(config, outName, fileType, "Merged detrend", format, phuView)) {
         psFree(outName);
-        return false;
-    }
-    if (output->type != fileType) {
-        psError(PS_ERR_IO, true, "%s is not of type %s", outName, pmFPAfileStringFromType(fileType));
-        psFree(outName);
-        return false;
-    }
-    output->save = true;
+        psFree(phuView);
+        return false;
+    }
     psFree(outName);
 
-    if (!pmFPAAddSourceFromView(fpa, "Merged detrend", phuView, format)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
-        psFree(fpa);
-        return false;
-    }
+    if (!outputFile(config, "PPMERGE.OUTPUT.SIGMA", fileType, "Merge sigma", format, phuView)) {
+        psFree(phuView);
+        return false;
+    }
+
+    if (!outputFile(config, "PPMERGE.OUTPUT.COUNT", fileType, "Merged count", format, phuView)) {
+        psFree(phuView);
+        return false;
+    }
+
     psFree(phuView);