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

Timestamp:

Jan 13, 2006, 5:14:07 PM (21 years ago)

Author:

Paul Price

Message:

Small hacks from updating psModule code for FPAs and concepts

File:

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

trunk/ppImage/src/ppImageParseDetrend.c

@@ -8 +8 @@
 // XXX : add fringe frame
 
-bool ppFPAOpen (ppFPA *fpa, psMetadata *camera, char *name, bool doThis) {
+bool ppFileOpen(ppFile *file, psMetadata *camera, char *name, bool doThis) {
 
     if (!doThis) {
-        return false;
+        return false;
     }
 
-    psLogMsg("phase2", PS_LOG_INFO, "Opening %s image: %s\n", name, fpa->filename);
-    fpa->fits = psFitsOpen(fpa->filename, "r"); // File handle
-    fpa->header = psFitsReadHeader(NULL, fpa->fits); // primary header
-    if (! pmConfigValidateCamera(camera, fpa->header)) {
-        psError(PS_ERR_IO, true, "%s (%s) does not seem to be from the correct camera.\n", name, fpa->filename);
-        exit(EXIT_FAILURE);
+    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);
     }
     return true;
@@ -26 +27 @@
 bool ppImageParseDetrend (ppData *data, ppOptions *options, ppConfig *config) {
 
-    ppFPAOpen (data->mask, config->camera, "mask", options->doMask);
-    ppFPAOpen (data->bias, config->camera, "bias", options->doBias);
-    ppFPAOpen (data->dark, config->camera, "dark", options->doDark);
-    ppFPAOpen (data->flat, config->camera, "flat", options->doFlat);
+    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;
 }