Changeset 15487 for trunk/Ohana/src/libfits/table/F_create_TH.c

Timestamp:

Nov 6, 2007, 5:09:52 PM (19 years ago)

Author:

eugene

Message:

merging changes from eam_branch_20071015 (read compressed images, clean addstar I/O, other minor issues)

File:

• trunk/Ohana/src/libfits/table/F_create_TH.c (modified) (5 diffs)

trunk/Ohana/src/libfits/table/F_create_TH.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
+# define NBYTES 2880
 
 /* a basic table header (extension) is different from a primary header
@@ -12 +13 @@
   char axis[10];
   
-  header[0].size = 2880;
-  ALLOCATE (header[0].buffer, char, 2880);
+  header[0].size = NBYTES;
+
+  ALLOCATE (header[0].buffer, char, NBYTES);
   
-  for (i = 0; i < 2880; i++) 
+  for (i = 0; i < NBYTES; i++) 
   header[0].buffer[i] = ' ';
   strncpy (header[0].buffer, "END", 3);
   
   gfits_modify (header, "XTENSION", "%s", 1, type);
-  gfits_modify (header, "BITPIX", "%d", 1, header[0].bitpix);
-  gfits_modify (header, "NAXIS",  "%d", 1, header[0].Naxes);
+  gfits_modify (header, "BITPIX",   "%d", 1, header[0].bitpix);
+  gfits_modify (header, "NAXIS",    "%d", 1, header[0].Naxes);
   
   for (i = 0; i < header[0].Naxes; i++) {
@@ -28 +30 @@
   }
   
-  /* PCOUNT & GCOUNT are not implemented, but they are required to be here */
-  gfits_modify (header, "PCOUNT", "%d", 1, 0);
-  gfits_modify (header, "GCOUNT", "%d", 1, 1);
+  gfits_modify (header, "PCOUNT", "%d", 1, header[0].pcount);
+  gfits_modify (header, "GCOUNT", "%d", 1, header[0].gcount);
   if (!strcmp (type, "IMAGE")) {
     gfits_modify (header, "BSCALE", "%lf", 1, header[0].bscale);
@@ -43 +44 @@
   
   int i, valid;
-  char axis[10];
 
   /* check valid table types */
@@ -51 +51 @@
   if (!valid) return (FALSE);
 
-  /* create empty header buffer */
-  header[0].size = 2880;
-  ALLOCATE (header[0].buffer, char, 2880);
-  
-  for (i = 0; i < 2880; i++) 
-  header[0].buffer[i] = ' ';
-  strncpy (header[0].buffer, "END", 3);
+  gfits_init_header (header);
 
-  /* a table has BITPIX = 8, NAXIS = 2 */
   header[0].simple = FALSE;
-  header[0].unsign = FALSE;
-  header[0].extend = FALSE;
-  header[0].bitpix = 8;
-  header[0].bscale = 1;
-  header[0].bzero  = 0;
   header[0].Naxes  = 2;
   for (i = 0; i < FT_MAX_NAXES; i++)
     header[0].Naxis[i] = 0;
-  
-  /* required keywords */
-  gfits_modify (header, "XTENSION", "%s", 1, type);
-  gfits_modify (header, "BITPIX", "%d", 1, header[0].bitpix);
-  gfits_modify (header, "NAXIS",  "%d", 1, header[0].Naxes);
-  
-  for (i = 0; i < header[0].Naxes; i++) {
-    sprintf (axis, "NAXIS%d", i + 1);
-    gfits_modify (header,  axis, "%d", 1, header[0].Naxis[i], 1);
-  }
-  
-  /* PCOUNT & GCOUNT are not implemented, but they are required to be here */
-  gfits_modify (header, "PCOUNT", "%d", 1, 0);
-  gfits_modify (header, "GCOUNT", "%d", 1, 1);
-  if (!strcmp (type, "IMAGE")) {
-    gfits_modify (header, "BSCALE", "%lf", 1, header[0].bscale);
-    gfits_modify (header, "BZERO",  "%lf", 1, header[0].bzero);
-  }
+
+  gfits_create_Theader (header, type);
 
   gfits_modify (header, "TFIELDS", "%d", 1, 0);