Changeset 38441 for trunk/Ohana/src/opihi/lib.shell/VectorIO.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/opihi/lib.shell/VectorIO.c (modified) (9 diffs)

trunk/Ohana/src/opihi/lib.shell/VectorIO.c

@@ -1 +1 @@
 # include "opihi.h"
   
-// write a set of vectors to a FITS file (vectors names become fits column names)
-int WriteVectorTable (Header *theader, FTable *ftable, char *extname, Vector **vec, int Nvec, char *format) {
+// write a set of vectors to a FITS FTable structure (vectors names become fits column names)
+static int WriteVectorTable (FTable *ftable, char *extname, Vector **vec, int Nvec, char *format, char nativeOrder) {
   
   int j;
@@ -8 +8 @@
   char *tformat = NULL;
 
+  Header *theader = ftable->header;
   gfits_create_table_header (theader, "BINTABLE", extname);
 
@@ -58 +59 @@
   for (j = 0; j < Nvec; j++) {
     if (vec[j][0].type == OPIHI_FLT) {
-      gfits_set_bintable_column_reformat (theader, ftable, vec[j][0].name, "double", vec[j][0].elements.Flt, vec[j][0].Nelements);
+      gfits_set_bintable_column_reformat (theader, ftable, vec[j][0].name, "double", vec[j][0].elements.Flt, vec[j][0].Nelements, nativeOrder);
     } else {
-      gfits_set_bintable_column_reformat (theader, ftable, vec[j][0].name, "int", vec[j][0].elements.Int, vec[j][0].Nelements);
+      gfits_set_bintable_column_reformat (theader, ftable, vec[j][0].name, "int", vec[j][0].elements.Int, vec[j][0].Nelements, nativeOrder);
     }
   }
@@ -70 +71 @@
 }
   
+# define VERBOSE 0
+int dump_raw_table (FTable *table, char *message) {
+# if (VERBOSE)
+  int i;
+  fprintf (stderr, "%s data: ", message);
+  for (i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
+    fprintf (stderr, "0x%02hhx ", table->buffer[i]);
+  }
+  fprintf (stderr, "\n");
+# endif
+  return TRUE;
+}
+
+int dump_cmp_table (FTable *table, char *message) {
+# if (VERBOSE)
+  int i;
+  fprintf (stderr, "%s pntr: ", message);
+  for (i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
+    fprintf (stderr, "0x%02hhx ", table->buffer[i]);
+  }
+  fprintf (stderr, "\n");
+
+  fprintf (stderr, "%s data: ", message);
+  for (i = 0; i < table->header->pcount; i++) {
+    fprintf (stderr, "0x%02hhx ", table->buffer[table->heap_start + i]);
+  }
+  fprintf (stderr, "\n");
+# endif
+  return TRUE;
+}
+
 // write a set of vectors to a FITS file (vectors names become fits column names)
-int WriteVectorTableFITS (char *filename, char *extname, Vector **vec, int Nvec, int append, char *format) {
-  
-  Header header;
-  Matrix matrix;
-  Header theader;
-  FTable ftable;
+int WriteVectorTableFITS (char *filename, char *extname, Vector **vec, int Nvec, int append, char *compress, char *format) {
+  
+  Header rawheader;
+  Header cmpheader;
+  FTable rawtable;
+  FTable cmptable;
 
   FILE *f = NULL;
@@ -91 +123 @@
   }
 
-  if (!WriteVectorTable (&theader, &ftable, extname, vec, Nvec, format)) goto escape;
+  // init so free below does not fail if table is not created
+  gfits_init_header (&rawheader);
+  gfits_init_header (&cmpheader);
+  gfits_init_table (&rawtable);
+  gfits_init_table (&cmptable);
+
+  rawtable.header = &rawheader;
+  if (!WriteVectorTable (&rawtable, extname, vec, Nvec, format, (compress != NULL))) goto escape;
+  // NOTE : for compression, the table is constructed in native by order 
+
+  FTable *outtable = &rawtable;
+  Header *outheader = &rawheader;
+
+  if (compress) {
+    cmptable.header = &cmpheader;
+
+    dump_raw_table (&rawtable, "wd raw");
+    if (!gfits_compress_table (&rawtable, &cmptable, 0, compress)) goto escape;
+
+    int i, Nfields;
+    if (!gfits_scan (&cmpheader, "TFIELDS", "%d", 1, &Nfields)) goto escape;
+    for (i = 0; i < Nfields; i++) {
+      gfits_byteswap_varlength_column (&cmptable, i+1);
+    }
+    dump_cmp_table (&cmptable, "wd cmp");
+
+    outtable = &cmptable;
+    outheader = &cmpheader;
+  }
 
   if (!append) {
+    Header header;
+    Matrix matrix;
     gfits_init_header (&header);
+    gfits_init_matrix (&matrix);
     header.extend = TRUE;
     gfits_create_header (&header);
@@ -103 +166 @@
     gfits_free_matrix (&matrix);
   }
-  gfits_fwrite_Theader (f, &theader);
-  gfits_fwrite_table  (f, &ftable);
-
-  gfits_free_header (&theader);
-  gfits_free_table (&ftable);
+
+  // write the actual table data
+  gfits_fwrite_Theader (f, outheader);
+  gfits_fwrite_table  (f, outtable);
+
+  gfits_free_header (&rawheader);
+  gfits_free_table (&rawtable);
+
+  if (compress) {
+    gfits_free_header (&cmpheader);
+    gfits_free_table (&cmptable);
+  }
 
   fclose (f);
@@ -114 +184 @@
 
  escape:
-  if (!append) {
-    gfits_free_header (&header);
-    gfits_free_matrix (&matrix);
-  }
-  gfits_free_header (&theader);
-  gfits_free_table (&ftable);
+  gfits_free_header (&rawheader);
+  gfits_free_table (&rawtable);
+
+  if (compress) {
+    gfits_free_header (&cmpheader);
+    gfits_free_table (&cmptable);
+  }
 
   fclose (f);
@@ -249 +320 @@
   ASSIGN_DATA(short,   short,   Int);
   ASSIGN_DATA(int,     int,     Int);
-  ASSIGN_DATA(int64_t, int64_t, Int);
+  ASSIGN_DATA(int64_t, int64_t, Flt); // int64_t has a problem: Int is too small, Flt is wrong precision
   ASSIGN_DATA(float,   float,   Flt);
   ASSIGN_DATA(double,  double,  Flt);
@@ -274 +345 @@
   ASSIGN_DATA_TRANSPOSE(short,   short,   Int);
   ASSIGN_DATA_TRANSPOSE(int,     int,     Int);
-  ASSIGN_DATA_TRANSPOSE(int64_t, int64_t, Int);
+  ASSIGN_DATA_TRANSPOSE(int64_t, int64_t, Flt);
   ASSIGN_DATA_TRANSPOSE(float,   float,   Flt);
   ASSIGN_DATA_TRANSPOSE(double,  double,  Flt);