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

Timestamp:

Mar 29, 2006, 10:55:42 AM (20 years ago)

Author:

magnier

Message:

fixed up output logic for files and views

File:

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

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

@@ -1 +1 @@
 #include <stdio.h>
 #include "pslib.h"
+#include "psAdditionals.h"
 #include "pmHDU.h"
 #include "pmFPA.h"
@@ -19 +20 @@
     psFree (file->names);
 
-    psFitsClose (file->fits);
+    if (file->fits != NULL) {
+        psFitsClose (file->fits);
+    }
 
     psFree (file->filerule);
@@ -26 +29 @@
     psFree (file->extxtra);
 
-    // these are just views:
-    // psFree (file->filename);
-    // psFree (file->extname);
+    psFree (file->filename);
+    psFree (file->extname);
+
+    // these are just views ??
     // psFree (file->phu);
     // psFree (file->header);
@@ -63 +67 @@
 }
 
-// XXX is a file allowed to be both READ and WRITE?
 pmFPAfile *pmFPAfileDefine (psMetadata *files, psMetadata *format, pmFPA *fpa, char *name)
 {
@@ -195 +198 @@
 }
 
-// open file (if not already opened XXX : better tracking of open state?
-bool pmFPAfileOpen (pmFPAfile *file, pmFPAview *view)
+// open file (if not already opened)
+bool pmFPAfileOpen (pmFPAfile *file, const pmFPAview *view)
 {
 
@@ -220 +223 @@
 
     // determine the file name
-    // XXX file->filename needs to be a copy, and freed in places like this...
     file->filename = pmFPAfileNameFromRule (file->filerule, file, view);
     if (file->filename == NULL)
@@ -227 +229 @@
     // indirect filenames
     if (!strcasecmp (file->filename, "@FPAIO")) {
+        psFree (file->filename);
         extra = pmFPAfileNameFromRule (file->filextra, file, view);
         file->filename = psMetadataLookupStr (&status, file->names, extra);
+        psFree (extra);
         if (file->filename == NULL)
             return false;
+        // psMetadataLookupStr just returns a view, file->filename must be protected
+        psMemIncrRefCounter (file->filename);
     }
     if (!strcasecmp (file->filename, "@DETDB")) {
+        psFree (file->filename);
         extra = pmFPAfileNameFromRule (file->filextra, file, view);
         // file->filename = pmDetrendSelect (extra);
+        psFree (extra);
         if (file->filename == NULL)
             return false;
+        psMemIncrRefCounter (file->filename);
     }
 
@@ -263 +272 @@
 }
 
-bool pmFPAfileRead (pmFPAfile *file, pmFPAview *view)
+bool pmFPAfileRead (pmFPAfile *file, const pmFPAview *view)
 {
     if (file->mode != PM_FPA_MODE_READ)
@@ -305 +314 @@
 }
 
-bool pmFPAfileWrite (pmFPAfile *file, pmFPAview *view)
+bool pmFPAfileWrite (pmFPAfile *file, const pmFPAview *view)
 {
     if (file->mode != PM_FPA_MODE_WRITE)
@@ -324 +333 @@
     switch (file->type) {
     case PM_FPA_FILE_IMAGE:
-        psLogMsg (__func__, 3, "write image disabled\n");
-        // XXX disabled for now
-        // XXX pmFPAviewWriteFitsImage (view, file->fits);
+        pmFPAviewWriteFitsImage (view, file);
+        psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
         break;
 
@@ -335 +343 @@
     case PM_FPA_FILE_CMF:
         pmFPAviewWriteObjects (view, file);
-        psTrace ("pmFPAfile", 5, "wrote %s (type: %d)\n", file->filename, file->type);
+        psTrace ("pmFPAfile", 5, "wrote object %s (fpa: %p)\n", file->filename, file->fpa);
         break;
 
@@ -345 +353 @@
 }
 
-bool pmFPAfileClose (pmFPAfile *file, pmFPAview *view)
+bool pmFPAfileClose (pmFPAfile *file, const pmFPAview *view)
 {
     if (file->state == PM_FPA_STATE_CLOSED) {
@@ -385 +393 @@
 
 // attempt open, read, write, or close pmFPAfiles in files
-bool pmFPAfileIOChecks (psMetadata *files, pmFPAview *view, pmFPAfilePlace place)
+bool pmFPAfileIOChecks (psMetadata *files, const pmFPAview *view, pmFPAfilePlace place)
 {
     // recipe override values (command-line options):
@@ -405 +413 @@
 
 // select the rule from the camera configuration, perform substitutions as needed
-char *pmFPAfileNameFromRule (char *rule, pmFPAfile *file, pmFPAview *view)
+char *pmFPAfileNameFromRule (char *rule, pmFPAfile *file, const pmFPAview *view)
 {
 
@@ -445 +453 @@
 }
 
-psImage *pmFPAfileReadoutImage (psMetadata *files, pmFPAview *view, char *name, int Nx, int Ny, int type)
+psImage *pmFPAfileReadoutImage (psMetadata *files, const pmFPAview *view, char *name, int Nx, int Ny, int type)
 {
     bool status;
@@ -476 +484 @@
 // given an already-opened fits file, read the components corresponding
 // to the specified view
-bool pmFPAviewReadFitsImage (pmFPAview *view, pmFPAfile *file)
+bool pmFPAviewReadFitsImage (const pmFPAview *view, pmFPAfile *file)
 {
     bool status;
@@ -506 +514 @@
         return status;
     }
+    return false;
 
     // XXX pmReadoutRead, pmReadoutReadSegement disabled for now
-    return false;
-
     # if (0)
 
@@ -526 +533 @@
 }
 
-// XXX image writes disabled for now
-# if (0)
-    // given an already-opened fits file, write the components corresponding
-    // to the specified view
-    bool pmFPAviewWriteFitsImage (pmFPAview *view, pmFPAfile *file)
+// given an already-opened fits file, write the components corresponding
+// to the specified view
+bool pmFPAviewWriteFitsImage (const pmFPAview *view, pmFPAfile *file)
 {
 
@@ -536 +541 @@
     psFits *fits = file->fits;
 
+    // pmFPAWrite takes care of all PHUs as needed
     if (view->chip == -1) {
-        pmFPAWrite (fpa, fits, NULL, NULL);
+        pmFPAWrite (fpa, fits, NULL);
         return true;
     }
@@ -546 +552 @@
     pmChip *chip = fpa->chips->data[view->chip];
 
+    // do we need to write out a PHU for this entry?
+    if (file->phu == NULL) {
+        pmHDU *hdu = pmFPAviewThisHDU (view, file->fpa);
+        pmHDU *phu = pmFPAviewThisPHU (view, file->fpa);
+        // if this hdu is the phu, the write function below will create the phu
+        if (hdu != phu) {
+            // we assume that the PHU is just a header
+            psMetadata *outhead = psMetadataCopy (NULL, phu->header);
+            psMetadataAdd (outhead, PS_LIST_TAIL, "EXTEND", PS_DATA_BOOL | PS_META_REPLACE, "this file has extensions", true);
+            psFitsWriteHeaderNotImage (file->fits, outhead);
+            file->phu = phu->header;
+            psTrace ("pmFPAfile", 5, "wrote phu %s (type: %d)\n", file->filename, file->type);
+            psFree (outhead);
+        }
+    }
+
     if (view->cell == -1) {
-        pmChipWrite (chip, fits, NULL, NULL);
+        pmChipWrite (chip, fits, NULL);
         return true;
     }
@@ -557 +579 @@
 
     if (view->readout == -1) {
-        pmCellWrite (cell, fits, NULL, NULL);
+        pmCellWrite (cell, fits, NULL);
         return true;
     }
-
-    if (view->readout >= cell->readouts->n) {
-        return false;
-    }
+    return false;
+
+    // XXX disable readout write for now
+    # if (0)
+
+        if (view->readout >= cell->readouts->n) {
+            return false;
+        }
     pmReadout *readout = cell->readouts->data[view->readout];
 
@@ -572 +598 @@
     }
     return true;
-}
-# endif
+    # endif
+}