Changeset 35756

Timestamp:

Jul 3, 2013, 2:08:28 PM (13 years ago)

Author:

eugene

Message:

add some init functions for tables and matrices

Location:

trunk/Ohana/src/libfits

Files:

• header/F_init_H.c (modified) (1 diff)
• include/gfitsio.h (modified) (3 diffs)
• matrix/F_create_M.c (modified) (1 diff)
• table/F_create_T.c (modified) (1 diff)
• table/F_define_column.c (modified) (1 diff)

trunk/Ohana/src/libfits/header/F_init_H.c

@@ -18 +18 @@
   header[0].Naxes  = 0;
   header[0].buffer = NULL;
-  for (i = 0; i < FT_MAX_NAXES; i++)
-    header[0].Naxis[i] = 0;
+  for (i = 0; i < FT_MAX_NAXES; i++) header[0].Naxis[i] = 0;
+  header[0].datasize = 0;
 
   return (TRUE);

trunk/Ohana/src/libfits/include/gfitsio.h

@@ -26 +26 @@
 # define FT_LINE_LENGTH          80  /* FITS header line length */
 # define FT_RECORD_SIZE        2880  /* FITS block size */
+
+# define FT_BZERO_INT16 1.0*0x8000        
+# define FT_BZERO_INT32 1.0*0x80000000
 
 /* this structure defines the buffer which contains a header
@@ -137 +140 @@
 /******************************* Matrix functions *************/
 
+int     gfits_init_matrix              PROTO((Matrix *matrix));
 void    gfits_add_matrix_value         PROTO((Matrix *matrix, off_t x, off_t y, double value)); 
 int     gfits_convert_format           PROTO((Header *header, Matrix *matrix, int outBitpix, double outScale, double outZero, int inBlank, int outUnsign));
@@ -165 +169 @@
 
 /******************************* Table functions *************/
+
+int     gfits_init_table               PROTO((FTable *table));
+int     gfits_init_vtable              PROTO((VTable *table));
 
 char   *gfits_table_print              PROTO((FTable *ftable,...));

trunk/Ohana/src/libfits/matrix/F_create_M.c

@@ -25 +25 @@
 }
 
+/*********************** fits create matrix *******************************/
+int gfits_init_matrix (Matrix *matrix) {
+
+  int i;
+
+  matrix[0].bitpix = 8;
+  matrix[0].unsign = FALSE;
+  matrix[0].bscale = 1.0;
+  matrix[0].bzero  = 0.0;
+  matrix[0].Naxes  = 0;
+  for (i = 0; i < FT_MAX_NAXES; i++) matrix[0].Naxis[i] = 0;
+
+  matrix[0].buffer = NULL;
+  matrix[0].datasize = 0;
+  return (TRUE);
+
+}
+
 // XXX free buffer if non-null: need to double check for existing frees

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

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
+
+/*********************** fits init table *******************************/
+int gfits_init_table (FTable *table) {
+  table[0].header = NULL;
+  table[0].buffer = NULL;
+  table[0].datasize = 0;
+  table[0].validsize = 0;
+  return (TRUE);
+
+}
+
+/*********************** fits init table *******************************/
+int gfits_init_vtable (VTable *table) {
+
+  table[0].header   = NULL;
+  table[0].buffer   = NULL;
+  table[0].row      = NULL;
+  table[0].Nrow     = 0;
+  table[0].datasize = 0;
+  table[0].pad      = 0;
+  return (TRUE);
+}
 
 /*********************** fits create table *******************************/

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

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
+
+# if (0)
+/*** special version of this function to define unsigned int columns (special values for BZERO, BSCALE) ********************/
+int gfits_define_bintable_column_unsigned_int (Header *header, char *format, char *label, char *comment, char *unit, int inttype) {
+
+  assert (label);
+  assert (format);
+
+  off_t Naxis1;
+  int Nfields, Nbytes, Nval;
+  char type[16], field[16];
+  
+  if (!gfits_bintable_format (format, type, &Nval, &Nbytes)) return (FALSE);
+  
+  Nfields = 0;
+  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
+  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1,  &Naxis1);
+  Nfields ++;
+  Naxis1 += Nbytes*Nval;
+
+  sprintf (field, "TTYPE%d", Nfields);
+  gfits_modify (header, field, "%s", 1, label);
+  gfits_modify_alt (header, field, "%C", 1, comment);
+  sprintf (field, "TUNIT%d", Nfields);
+  gfits_modify (header, field, "%s", 1, unit);
+  sprintf (field, "TFORM%d", Nfields);
+  gfits_modify (header, field, "%s", 1, format);
+
+  // add scaling parameters unless they amount to a noop
+  if ((bscale != 1.0) || (bzero != 0.0)) {
+      sprintf (field, "TSCAL%d", Nfields);
+      gfits_modify (header, field, "%lf", 1, bscale);
+      sprintf (field, "TZERO%d", Nfields);
+      gfits_modify (header, field, "%lf", 1, bzero);
+  }
+
+  /* update TFIELDS & NAXIS1 */
+  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
+  gfits_modify (header, "NAXIS1",  OFF_T_FMT, 1,  Naxis1);
+  header[0].Naxis[0] = Naxis1;
+
+  return (TRUE);
+}
+# endif
 
 /***********************/