Changeset 6568 for branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c

Timestamp:

Mar 9, 2006, 10:56:39 AM (20 years ago)

Author:

magnier

Message:

fixed compile errors in the new pmFPAview and pmFPAfile

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c (modified) (9 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPAfile.c

@@ -1 +1 @@
 #include <stdio.h>
 #include "pslib.h"
+#include "pmHDU.h"
+#include "pmFPA.h"
 #include "pmFPAview.h"
 #include "pmFPAfile.h"
-
-static void pmPFAfileFree (pmFPAfile *file)
+#include "pmFPAviewObjectsIO.h"
+
+static void pmFPAfileFree (pmFPAfile *file)
 {
 
@@ -10 +13 @@
         return;
 
-    // psFree (file->element);
+    psFree (file->fits);
+    psFree (file->filerule);
+    psFree (file->filextra);
+    psFree (file->extrule);
+    psFree (file->extxtra);
+    psFree (file->filename);
+    psFree (file->extname);
     return;
 }
@@ -18 +27 @@
 
     pmFPAfile *file = psAlloc (sizeof(pmFPAfile));
-
-    // file->element = foo;
+    psMemSetDeallocator (file, (psFreeFunc) pmFPAfileFree);
+
+    file->fits = NULL;
+    file->filerule = NULL;
+    file->filextra = NULL;
+    file->extrule  = NULL;
+    file->extxtra  = NULL;
+    file->filename = NULL;
+    file->extname  = NULL;
     return (file);
 }
 
-pmFile *pmFPAfileDefine (pmFPAview *view, psMetadata *camera, char *name)
-{
+// XXX is a file allowed to be both READ and WRITE?
+pmFPAfile *pmFPAfileDefine (pmFPAview *view, psMetadata *camera, char *name)
+{
+
+    bool status;
+    char *depth;
 
     // select the name from the camera config data
-    psMetadata *data = psMetadataLookup (&status, camera, name);
+    psMetadata *data = psMetadataLookupPtr (&status, camera, name);
     if (data == NULL) {
         return false;
@@ -39 +59 @@
 
     file->openDepth = PM_FPA_DEPTH_NONE;
-    char *depth = psMetadataLookupStr (&status, data, "OPEN.DEPTH");
+    depth = psMetadataLookupStr (&status, data, "OPEN.DEPTH");
     if (depth != NULL) {
         if (!strcasecmp (depth, "FPA"))     {
@@ -56 +76 @@
 
     file->readDepth = PM_FPA_DEPTH_NONE;
-    char *depth = psMetadataLookupStr (&status, data, "READ.DEPTH");
+    depth = psMetadataLookupStr (&status, data, "READ.DEPTH");
     if (depth != NULL) {
         if (!strcasecmp (depth, "FPA"))     {
@@ -73 +93 @@
 
     file->writeDepth = PM_FPA_DEPTH_NONE;
-    char *depth = psMetadataLookupStr (&status, data, "WRITE.DEPTH");
+    depth = psMetadataLookupStr (&status, data, "WRITE.DEPTH");
     if (depth != NULL) {
         if (!strcasecmp (depth, "FPA"))     {
-            file->readDepth = PM_FPA_DEPTH_FPA;
+            file->writeDepth = PM_FPA_DEPTH_FPA;
         }
         if (!strcasecmp (depth, "CHIP"))    {
-            file->readDepth = PM_FPA_DEPTH_CHIP;
+            file->writeDepth = PM_FPA_DEPTH_CHIP;
         }
         if (!strcasecmp (depth, "CELL"))    {
-            file->readDepth = PM_FPA_DEPTH_CELL;
+            file->writeDepth = PM_FPA_DEPTH_CELL;
         }
         if (!strcasecmp (depth, "READOUT")) {
-            file->readDepth = PM_FPA_DEPTH_READOUT;
-        }
-    }
+            file->writeDepth = PM_FPA_DEPTH_READOUT;
+        }
+    }
+
+    if ((file->readDepth != PM_FPA_DEPTH_NONE) && (file->writeDepth != PM_FPA_DEPTH_NONE)) {
+        psLogMsg (__func__, 3, "warning: file %s is set to both read and write; write is ignored\n", name);
+        file->writeDepth = PM_FPA_DEPTH_NONE;
+    }
+
     return (file);
 }
@@ -94 +120 @@
 {
 
+    bool status;
+    char *extra;
+
     // is current depth == open depth?
-    depth = pmFPAviewDepth (view);
+    pmFPAdepth depth = pmFPAviewDepth (view);
     if (file->openDepth != depth) {
         return false;
@@ -101 +130 @@
 
     // determine the file name
-    file->filename = pmConfigNameFromRule (file->filerule, view);
+    file->filename = pmFPAviewNameFromRule (file->filerule, view);
 
     // indirect filenames
     if (!strcasecmp (file->filename, "@FPAIO")) {
-        extra = pmConfigNameFromRule (file->filextra, view);
-        file->filename = psMetadataLookupStr (&status, fpi->IO, extra);
+        extra = pmFPAviewNameFromRule (file->filextra, view);
+        file->filename = psMetadataLookupStr (&status, view->IO, extra);
     }
     if (!strcasecmp (file->filename, "@DETDB")) {
-        extra = pmConfigNameFromRule (file->filextra, camera, view);
-        file->filename = pmDetrendSelect (extra);
-    }
-
-    if (file->mode == READ) {
+        extra = pmFPAviewNameFromRule (file->filextra, view);
+        // file->filename = pmDetrendSelect (extra);
+    }
+
+    if (file->readDepth != PM_FPA_DEPTH_NONE) {
         file->fits = psFitsOpen (file->filename, "r");
-    } else {
+    } else if (file->writeDepth != PM_FPA_DEPTH_NONE) {
         file->fits = psFitsOpen (file->filename, "w");
     }
-}
-
-bool pmFPAfileRead (pmFPAfile *file, pmFPAview *view, psMetadata *camera)
+    return true;
+}
+
+bool pmFPAfileRead (pmFPAfile *file, pmFPAview *view)
 {
 
     // is current depth == open depth?
-    depth = pmFPAviewDepth (view);
+    pmFPAdepth depth = pmFPAviewDepth (view);
     if (file->readDepth != depth) {
         return false;
     }
 
-    if (file->mode != READ) {
-        return false;
-    }
-
-    if (file->type == FITS) {
-        // read all selected elements for this view?
-        pmFPAviewReadFitsImage (view, file->fits, phu?, database?);
-    }
-
-    if (file->type == SMP) {
-        // read all selected elements for this view?
-        pmFPAviewReadSMP (view->fpa, file->fits, phu?, database?);
-    }
-}
-
-bool pmFPAfileWrite (pmFPAfile *file, pmFPAview *view, psMetadata *camera)
+    if (file->readDepth == PM_FPA_DEPTH_NONE) {
+        return false;
+    }
+
+    switch (file->type) {
+    case PM_FPA_FILE_IMAGE:
+        pmFPAviewReadFitsImage (view, file->fits);
+        break;
+
+    case PM_FPA_FILE_SX:
+    case PM_FPA_FILE_OBJ:
+    case PM_FPA_FILE_CMP:
+    case PM_FPA_FILE_CMF:
+        pmFPAviewReadObjects (view, file);
+        break;
+
+    default:
+        fprintf (stderr, "warning: type mismatch\n");
+        return false;
+    }
+    return true;
+}
+
+bool pmFPAfileWrite (pmFPAfile *file, pmFPAview *view)
 {
 
     // is current depth == open depth?
-    depth = pmFPAviewDepth (view);
+    pmFPAdepth depth = pmFPAviewDepth (view);
     if (file->writeDepth != depth) {
         return false;
     }
 
-    if (file->mode != WRITE) {
-        return false;
-    }
-
-    if (file->type == FITS) {
-        // read all selected elements for this view?
-        pmFPAviewWriteFitsImage (view, file->fits, phu?, database?);
-    }
-
-    if (file->type == SMP) {
-        // read all selected elements for this view?
-        pmFPAviewWriteSMP (view->fpa, file->fits, phu?, database?);
-    }
+    if (file->writeDepth == PM_FPA_DEPTH_NONE) {
+        return false;
+    }
+
+    switch (file->type) {
+    case PM_FPA_FILE_IMAGE:
+        psLogMsg (__func__, 3, "write image disabled\n");
+        // XXX disabled for now
+        // XXX pmFPAviewWriteFitsImage (view, file->fits);
+        break;
+
+    case PM_FPA_FILE_SX:
+    case PM_FPA_FILE_OBJ:
+    case PM_FPA_FILE_CMP:
+    case PM_FPA_FILE_CMF:
+        pmFPAviewWriteObjects (view, file);
+        break;
+
+    default:
+        fprintf (stderr, "warning: type mismatch\n");
+        return false;
+    }
+    return true;
 }
 
@@ -179 +227 @@
 
         pmFPAfileOpen (file, view, camera);
-        pmFPAfileRead (file, view, camera);
+        pmFPAfileRead (file, view);
     }
     psFree (iter);