Changeset 38330 for branches/eam_branches/ohana.20150429/src/opihi/lib.shell/VectorIO.c

Timestamp:

May 28, 2015, 8:28:24 PM (11 years ago)

Author:

eugene

Message:

adding compression option to wd and write

File:

• branches/eam_branches/ohana.20150429/src/opihi/lib.shell/VectorIO.c (modified) (6 diffs)

branches/eam_branches/ohana.20150429/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) {
   
   int j;
@@ -8 +8 @@
   char *tformat = NULL;
 
+  Header *theader = ftable->header;
   gfits_create_table_header (theader, "BINTABLE", extname);
 
@@ -71 +72 @@
   
 // 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, int compress, char *format) {
+  
+  Header rawheader;
+  Header cmpheader;
+  FTable rawtable;
+  FTable cmptable;
 
   FILE *f = NULL;
@@ -91 +92 @@
   }
 
-  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)) goto escape;
+
+  FTable *outtable = &rawtable;
+  Header *outheader = &rawheader;
+
+  if (compress) {
+    cmptable.header = &cmpheader;
+    if (!gfits_compress_table (&rawtable, &cmptable, 10, "GZIP_1")) goto escape;
+    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 +124 @@
     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 +142 @@
 
  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);