Changeset 7067 for trunk/ppMerge/src/ppMergeCheckInputs.c

Timestamp:

May 4, 2006, 3:53:10 PM (20 years ago)

Author:

Paul Price

Message:

Code compiles now. Not yet tested.

File:

• trunk/ppMerge/src/ppMergeCheckInputs.c (modified) (6 diffs)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -4 +4 @@
 #include <psmodules.h>
 
+#include "ppMerge.h"
 #include "ppMergeCheckInputs.h"
 #include "ppMergeData.h"
@@ -9 +10 @@
 // Check input files to make sure everything's consistent
 ppMergeData *ppMergeCheckInputs(ppMergeOptions *options, // Options
-                                const pmConfig *config // Configuration
+                                pmConfig *config // Configuration
     )
 {
@@ -34 +35 @@
         psFits *inFile = psFitsOpen(filenames->data[i], "r"); // The FITS file to read
         if (!inFile) {
-            psErrorPrint(PS_ERR_IO, false, "Unable to open input file %s --- ignored.\n", name);
+            psLogMsg(__func__, PS_LOG_WARN, "Unable to open input file %s --- ignored.\n", name);
             // Kick it out
             psFree(filenames->data[i]);
@@ -51 +52 @@
             data->format = pmConfigCameraFormatFromHeader(config, header);
             psFree(header);
-            if (!options->format) {
+            if (!data->format) {
                 psLogMsg(__func__, PS_LOG_WARN, "Unable to identify camera format for input file %s --- "
                              "ignored.\n", name);
@@ -59 +60 @@
                 continue;
             }
-        } else if (!pmConfigValidateCameraFormat(options->format, header)) {
+        } else if (!pmConfigValidateCameraFormat(data->format, header)) {
             psLogMsg(__func__, PS_LOG_WARN, "Input file %s doesn't match camera format --- ignored.\n", name);
             // Kick it out
@@ -99 +100 @@
     data->numCells = numCells;
 
-    return (numGood > 1);
+    if (numGood > 1) {
+        return data;
+    }
+
+    psFree(data);
+    return NULL;
 }