Changeset 7306

Timestamp:

Jun 2, 2006, 2:40:46 PM (20 years ago)

Author:

magnier

Message:

cleaned up CMP header output code

Location:

trunk/psModules/src/objects

Files:

• pmSourceIO.c (modified) (4 diffs)
• pmSourceIO_CMP.c (modified) (3 diffs)

trunk/psModules/src/objects/pmSourceIO.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-30 22:08:02 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-03 00:40:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -177 +177 @@
         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");
@@ -213 +202 @@
             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);
+            psFitsWriteBlank (file->fits, outhead);
             file->phu = phu->header;
             psTrace ("pmFPAfile", 5, "wrote phu %s (type: %d)\n", file->filename, file->type);
@@ -225 +214 @@
             outhead = psMetadataCopy (NULL, hdu->header);
             psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTNAME", PS_META_REPLACE, "extension name", headname);
-            psFitsWriteHeaderNotImage (file->fits, outhead);
+            psFitsWriteBlank (file->fits, outhead);
             psTrace ("pmFPAfile", 5, "wrote ext head %s (type: %d)\n", file->filename, file->type);
             file->header = hdu->header;

trunk/psModules/src/objects/pmSourceIO_CMP.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-27 02:33:29 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-03 00:40:46 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39 +39 @@
 
     int i, type, nSrc;
-    psMetadataItem *mdi;
+    // psMetadataItem *mdi;
     psF32 *PAR, *dPAR;
     float lsky = 0;
@@ -61 +61 @@
     psMetadataAdd (header, PS_LIST_TAIL, "NSTARS", PS_DATA_S32 | PS_META_REPLACE, "NUMBER OF STARS", nSrc);
 
-    // set NAXIS to 0 : CFITSIO requires isolated header to have NAXIS = 0
-    mdi = psMetadataLookup (header, "NAXIS");
-    mdi->data.S32 = 0;
-    mdi->type = PS_DATA_S32;
+    // MEF elements have XTENSION, not SIMPLE: remove this (replace with SIMPLE)
+    psMetadataRemoveKey (header, "XTENSION");
 
     // create file, write-out header
+    psMetadataAddS32 (header, PS_LIST_HEAD, "NAXIS", PS_META_REPLACE, "head data only", 0);
+    psMetadataAddBool (header, PS_LIST_HEAD, "SIMPLE", PS_META_REPLACE, "CMP file, not simple", false);
+
     psFits *fits = psFitsOpen (filename, "w");
-    psFitsWriteHeader(fits, header);
+    psFitsWriteBlank(fits, header);
     psFitsClose (fits);