Changeset 38441 for trunk/Ohana/src/libfits/table/F_table_varlength.c

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_table_varlength.c (modified) (5 diffs)

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

@@ -2 +2 @@
 # include <gfitsio.h>
 
+// fills the column definition structure for a specific column based on a given table.
 int gfits_varlength_column_define (FTable *ftable, VarLengthColumn *def, int column) {
 
@@ -14 +15 @@
   snprintf (field, 80, "TFORM%d", column);
   if (!gfits_scan (ftable->header, field, "%s", 1, format)) return (FALSE);
+
+  def->column = column;
 
   // find and remove the max field length element
@@ -48 +51 @@
   if (*p1 == 'I') { def->nbytes = 2;  def->format = *p1; }
   if (*p1 == 'J') { def->nbytes = 4;  def->format = *p1; }
+  if (*p1 == 'K') { def->nbytes = 8;  def->format = *p1; }
   if (*p1 == 'E') { def->nbytes = 4;  def->format = *p1; }
   if (*p1 == 'D') { def->nbytes = 8;  def->format = *p1; }
@@ -54 +58 @@
   if (!def->nbytes) { return (FALSE); }
   
-  /* scan columns to find column offset */
-  def->Nstart = 0;
+  /* scan columns to find column offset for metadata column*/
+  def->offset = 0;
   for (i = 1; i < column; i++) {
     sprintf (field, "TFORM%d", i);
     gfits_scan (ftable->header, field, "%s", 1, format);
     gfits_bintable_format (format, tmpline, &Nv, &Nb);
-    def->Nstart += Nv*Nb;
+    def->offset += Nv*Nb;
   }
 
   // heap_start must be long long so file may be very large
-  if (!gfits_scan (ftable->header, "THEAP", OFF_T_FMT, 1,  &def->heap_start)) {
-    def->heap_start = ftable->header->Naxis[0]*ftable->header->Naxis[1];
-  }
-
+  // confirm that ftable->heap_start is correctly set?
+
+  return TRUE;
+}
+
+# define SWAP_WORD \
+  tmp = pchar[0]; pchar[0] = pchar[3]; pchar[3] = tmp; \
+  tmp = pchar[1]; pchar[1] = pchar[2]; pchar[2] = tmp;
+
+# define SWAP_DBLE \
+  tmp = pchar[0]; pchar[0] = pchar[7]; pchar[7] = tmp; \
+  tmp = pchar[1]; pchar[1] = pchar[6]; pchar[6] = tmp; \
+  tmp = pchar[2]; pchar[2] = pchar[5]; pchar[5] = tmp; \
+  tmp = pchar[3]; pchar[3] = pchar[4]; pchar[4] = tmp;
+
+int gfits_byteswap_varlength_column (FTable *ftable, int column) {
+
+# ifdef BYTE_SWAP  
+  VarLengthColumn zdef;
+  if (!gfits_varlength_column_define (ftable, &zdef, column)) return FALSE;
+
+  char *bufstart = &ftable->buffer[zdef.offset];
+
+  int i;
+  char *pchar, tmp;
+
+  off_t Nx = ftable->header->Naxis[0];
+
+  for (i = 0; i < ftable->header->Naxis[1]; i++) {
+    if (zdef.mode == 'P') {
+      pchar = &bufstart[i*Nx];
+      SWAP_WORD;
+      pchar = &bufstart[i*Nx + 4];
+      SWAP_WORD;
+    }      
+    if (zdef.mode == 'Q') {
+      char *pchar, tmp;
+      pchar = &bufstart[i*Nx];
+      SWAP_DBLE;
+      pchar = &bufstart[i*Nx + 8];
+      SWAP_DBLE;
+    }
+  }
+# endif
   return TRUE;
 }
@@ -75 +119 @@
 void *gfits_varlength_column_pointer (FTable *ftable, VarLengthColumn *column, off_t row, off_t *length) {
 
-  void *result;
-  off_t offset, Nx;
-
   if ((column->mode != 'P') && (column->mode != 'Q')) abort();
 
   // find the values for the specified row
   // the values in the main table for this row and varlength column:
-  Nx = ftable->header->Naxis[0];
-
-# define SWAP_WORD \
-  tmp = pchar[0]; pchar[0] = pchar[3]; pchar[3] = tmp; \
-  tmp = pchar[1]; pchar[1] = pchar[2]; pchar[2] = tmp;
-
-# ifdef BYTE_SWAP
-  char *pchar, tmp;
-  pchar = &ftable->buffer[row*Nx + column->Nstart];
-  SWAP_WORD;
-  pchar = &ftable->buffer[row*Nx + column->Nstart + 4];
-  SWAP_WORD;
-# endif
+  off_t Nx = ftable->header->Naxis[0];
+  off_t offset = 0;
 
   if (column->mode == 'P') {
     int *ptr;
-    ptr = (int *) &ftable->buffer[row*Nx + column->Nstart];
+    ptr = (int *) &ftable->buffer[row*Nx + column->offset];
     *length = ptr[0];
     offset = ptr[1];
-  } else if (column->mode == 'Q') {
+  } 
+  if (column->mode == 'Q') {
     off_t *ptr;
-    ptr = (off_t *) &ftable->buffer[row*Nx + column->Nstart];
+    ptr = (off_t *) &ftable->buffer[row*Nx + column->offset];
     *length = ptr[0];
     offset = ptr[1];
-  } else {
-        // this was actually trapped above
-        abort();
-  }
-
-  result = (void *) (ftable->buffer + column->heap_start + offset);
+  }
+
+  // fprintf (stderr, "length: %d, offset: %d\n", (int) *length, (int) offset);
+
+  void *result = (void *) (ftable->buffer + ftable->heap_start + offset);
   return result;
 }
+
+// to generate a compressed image or a compressed table, we need to be able to add data
+// for varlength columns to the heap.  To start, assume we have defined the cartesian
+// portion of the table correctly, and are only extending the heap.
+
+int gfits_varlength_column_add_data (FTable *table, char *data, off_t Ndata, int row, VarLengthColumn *column) {
+
+  // find the current starting point for new data (end of current buffer main data + current heap
+  off_t heap_offset = gfits_data_min_size (table->header);
+
+  // extend the buffer size to add the new data
+  off_t Nbytes = gfits_data_pad_size (heap_offset + Ndata);
+  REALLOCATE (table->buffer, char, Nbytes);
+
+  char *heap_ptr = table->buffer + heap_offset;
+
+  // add the new data to the table buffer
+  memcpy (heap_ptr, data, Ndata);
+
+  // *** now we add the data description to the table ***
+
+  if ((column->mode != 'P') && (column->mode != 'Q')) abort();
+
+  // find the cell for the specified row & column
+  // the values in the main table for this row and varlength column:
+  int Nx = table->header->Naxis[0];
+
+  // set the cell values
+  if (column->mode == 'P') {
+    int *ptr;
+    ptr = (int *) &table->buffer[row*Nx + column->offset];
+    ptr[0] = Ndata;
+    ptr[1] = heap_offset - table->heap_start;
+  } 
+  if (column->mode == 'Q') {
+    off_t *ptr;
+    ptr = (off_t *) &table->buffer[row*Nx + column->offset];
+    ptr[0] = Ndata;
+    ptr[1] = heap_offset - table->heap_start;
+  }
+
+  // update maxlen
+  // fprintf (stderr, "row: %d, Ndata: %d, maxlen: %d\n", (int) row, (int) Ndata, (int) column->maxlen);
+  column->maxlen = MAX (column->maxlen, Ndata);
+
+  off_t pcount;
+  gfits_scan (table->header, "PCOUNT", OFF_T_FMT, 1, &pcount);
+
+  pcount += Ndata;
+  gfits_modify (table->header, "PCOUNT", OFF_T_FMT, 1, pcount);
+  table->header->pcount = pcount;
+  table->datasize = gfits_data_size (table->header);
+  myAssert (table->datasize == Nbytes, "inconsistent header and data");
+
+  return TRUE;
+}
+
+// update the header TFORM value for this entry
+int gfits_varlength_column_finish (FTable *ftable, VarLengthColumn *def) {
+
+  char field[81];
+  char format[81];
+
+  // grab the value of TFORMn for this column
+  snprintf (field, 80, "TFORM%d", def->column);
+  if (!gfits_scan (ftable->header, field, "%s", 1, format)) return FALSE;
+
+  // find and update the max field length element
+  char *p1 = strchr (format, '(');
+  if (!p1) return (FALSE); // not a valid varlength column -- missing (e_max)
+  
+  p1 ++;
+  *p1 = 0;
+
+  snprintf (p1, 80 - (p1 - format), "%d)", def->maxlen);
+  if (!gfits_modify (ftable->header, field, "%s", 1, format)) return FALSE;
+
+  return TRUE;
+}