Changeset 6726 for branches/rel10_ifa/psModules/src/objects/pmFPAviewWriteObjects.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/objects/pmFPAviewWriteObjects.c (modified) (12 diffs)

branches/rel10_ifa/psModules/src/objects/pmFPAviewWriteObjects.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-28 02:14:56 $
+ *  @version $Revision: 1.1.2.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-29 20:55:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -14 +14 @@
 #include <string.h>
 #include "pslib.h"
+#include "psAdditionals.h"
 #include "pmHDU.h"
 #include "pmFPA.h"
@@ -27 +28 @@
 #include "pmFPAviewObjectsIO.h"
 
-bool psFitsWriteHeaderNotImage (psFits *fits, psMetadata *header)
-{
-
-    int status = 0;
-    char fitsErr[1024];
-
-    psMetadataItem *mdi = NULL;
-    mdi = psMetadataLookup (header, "NAXIS");
-    if (mdi != NULL) {
-        mdi->data.S32 = 0;
-        mdi->type = PS_DATA_S32;
-    }
-
-    fits_create_img (fits->fd, SHORT_IMG, 0, NULL, &status);
-
-    if (status != 0) {
-        fits_get_errstatus (status, fitsErr);
-        psError (PS_ERR_IO, true, PS_ERRORTEXT_psFits_WRITE_FAILED, fitsErr);
-        exit (2);
-    }
-
-    psFitsWriteHeader (header, fits);
-
-    return true;
-}
-
 // Given a FITS file pointer, read the table of object data
-bool pmFPAviewWriteObjects (pmFPAview *view, pmFPAfile *file)
+bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file)
 {
 
@@ -94 +69 @@
 
 // read in all chip-level Objects files for this FPA
-bool pmFPAWriteObjects (pmFPA *fpa, pmFPAview *view, pmFPAfile *file)
+bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file)
 {
 
@@ -106 +81 @@
 
 // read in all cell-level Objects files for this chip
-bool pmChipWriteObjects (pmChip *chip, pmFPAview *view, pmFPAfile *file)
+bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file)
 {
 
@@ -118 +93 @@
 
 // read in all readout-level Objects files for this cell
-bool pmCellWriteObjects (pmCell *cell, pmFPAview *view, pmFPAfile *file)
+bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file)
 {
 
@@ -130 +105 @@
 
 // read in all readout-level Objects files for this cell
-bool pmReadoutWriteObjects (pmReadout *readout, pmFPAview *view, pmFPAfile *file)
+bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file)
 {
 
@@ -139 +114 @@
     pmHDU *hdu;
     pmHDU *phu;
+    psMetadata *updates;
+    psMetadata *outhead;
 
     psArray *sources = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.SOURCES");
-    return true;
 
     switch (file->type) {
@@ -166 +142 @@
         hdu = pmFPAviewThisHDU (view, file->fpa);
         filename = pmFPAfileNameFromRule (file->filerule, file, view);
-        pmSourcesWriteCMP (sources, filename, hdu->header);
+
+        // copy the header to an output header, add the output header data
+        outhead = psMetadataCopy (NULL, hdu->header);
+
+        // check/fix first line (must be SIMPLE = F)
+        psMetadataItem *item = psMetadataGet (outhead, PS_LIST_HEAD);
+        if (strcmp (item->name, "SIMPLE") && strcmp (item->name, "XTENSION")) {
+            psErrorStackPrint(stderr, "invalid header: first line is neither SIMPLE nor XTENSION\n");
+            exit(EXIT_FAILURE);
+        }
+        if (!strcmp (item->name, "XTENSION")) {
+            psMetadataRemoveIndex (outhead, PS_LIST_HEAD);
+        }
+        psMetadataAddBool (outhead, PS_LIST_HEAD, "SIMPLE", PS_META_REPLACE, "CMP file, not simple", false);
+
+        // copy over the entries saved in the
+        updates = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.HEADER");
+        psMetadataCopy (outhead, updates);
+
+        pmSourcesWriteCMP (sources, filename, outhead);
+        psFree (outhead);
         psFree (filename);
         break;
@@ -184 +180 @@
 
             // CMF always has extensions
-            psMetadataAdd (phu->header, PS_LIST_TAIL, "EXTEND", PS_DATA_BOOL | PS_META_REPLACE, "this file has extensions", true);
-            psFitsWriteHeaderNotImage (file->fits, phu->header);
+            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);
-
-            file->phu = phu->header;
+            psFree (outhead);
         }
 
@@ -196 +192 @@
             // determine name for header extension
             headname = pmFPAfileNameFromRule (file->extxtra, file, view);
-            psMetadataAddStr (hdu->header, PS_LIST_TAIL, "EXTNAME", PS_META_REPLACE, "extension name", headname);
-            psFitsWriteHeaderNotImage (file->fits, hdu->header);
+            outhead = psMetadataCopy (NULL, hdu->header);
+            psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTNAME", PS_META_REPLACE, "extension name", headname);
+            psFitsWriteHeaderNotImage (file->fits, outhead);
             psTrace ("pmFPAfile", 5, "wrote ext head %s (type: %d)\n", file->filename, file->type);
             file->header = hdu->header;
+            psFree (outhead);
             psFree (headname);
         }
@@ -205 +203 @@
         // write this table to disk
         dataname = pmFPAfileNameFromRule (file->extrule, file, view);
-        pmSourcesWriteCMF (file->fits, sources, hdu->header, dataname);
+        updates = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.HEADER");
+        pmSourcesWriteCMF (file->fits, sources, updates, dataname);
+        psTrace ("pmFPAfile", 5, "wrote ext data %s (type: %d)\n", file->filename, file->type);
         psFree (dataname);
         break;