Changeset 6747 for trunk/ppImage/src/ppImageParseDetrend.c

Timestamp:

Mar 31, 2006, 3:24:14 PM (20 years ago)

Author:

Paul Price

Message:

ppImage now working again.

File:

• trunk/ppImage/src/ppImageParseDetrend.c (modified) (2 diffs)

trunk/ppImage/src/ppImageParseDetrend.c

@@ -1 +1 @@
 #include <stdio.h>
 #include "pslib.h"
-#include "pmConfig.h"
+#include "psmodules.h"
 #include "ppFile.h"
 #include "ppImageData.h"
@@ -14 +14 @@
 // XXX : add fringe frame
 
-bool ppFileOpen(ppFile *file, psMetadata *camera, char *name, bool doThis) {
-
-    if (!doThis) {
-        return false;
-    }
-
-    psLogMsg("phase2", PS_LOG_INFO, "Opening %s image: %s\n", name, file->filename);
-    file->fits = psFitsOpen(file->filename, "r"); // File handle
-    file->phu = psFitsReadHeader(NULL, file->fits); // primary header
-    if (! pmConfigValidateCamera(camera, file->phu)) {
-        psError(PS_ERR_IO, true, "%s (%s) does not seem to be from the correct camera.\n", name,
-                file->filename);
-        exit(EXIT_FAILURE);
-    }
+bool ppImageParseDetrend(ppImageData *data, ppImageOptions *options, pmConfig *config)
+{
+    ppFileOpen(data->mask, "mask", options->doMask);
+    ppFileOpen(data->bias, "bias", options->doBias);
+    ppFileOpen(data->dark, "dark", options->doDark);
+    ppFileOpen(data->flat, "flat", options->doFlat);
     return true;
 }
-
-bool ppImageParseDetrend(ppImageData *data, ppImageOptions *options, ppConfig *config) {
-
-    ppFileOpen(data->mask, config->camera, "mask", options->doMask);
-    ppFileOpen(data->bias, config->camera, "bias", options->doBias);
-    ppFileOpen(data->dark, config->camera, "dark", options->doDark);
-    ppFileOpen(data->flat, config->camera, "flat", options->doFlat);
-    return true;
-}