Changeset 38330 for branches/eam_branches/ohana.20150429/src/opihi/cmd.data

Timestamp:

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

Author:

eugene

Message:

adding compression option to wd and write

Location:

branches/eam_branches/ohana.20150429/src/opihi/cmd.data

Files:

• wd.c (modified) (3 diffs)
• write_vectors.c (modified) (4 diffs)

branches/eam_branches/ohana.20150429/src/opihi/cmd.data/wd.c

@@ -3 +3 @@
 int wd (int argc, char **argv) {
   
-  int N, Extend;
+  int N, Extend, Compress;
   int newUnsign, newBitpix, newScale, newZero;
   int outUnsign, outBitpix;
@@ -16 +16 @@
     remove_argument (N, &argc, argv);
     Extend  = TRUE;
+  }
+
+  Compress = FALSE;
+  if ((N = get_argument (argc, argv, "-compress"))) {
+    remove_argument (N, &argc, argv);
+    Compress = TRUE;
   }
 
@@ -162 +168 @@
   }
   
+  // not compatible with extend
+  if (Compress) {
+    Header myHeader;
+    Matrix myMatrix;
+
+    FILE *f = fopen (argv[2], "w");
+    if (!f) {
+      fprintf (stderr, "ERROR: cannot open image subset file for output %s\n", argv[2]);
+      return FALSE;
+    }
+    
+    gfits_init_header (&myHeader);
+    myHeader.extend = TRUE;
+    gfits_create_header (&myHeader);
+    gfits_create_matrix (&myHeader, &myMatrix);
+    gfits_fwrite_header  (f, &myHeader);
+    gfits_fwrite_matrix  (f, &myMatrix);
+    gfits_free_header (&myHeader);
+    gfits_free_matrix (&myMatrix);
+
+    FTable ftable;
+    Header theader;
+
+    ftable.header = &theader;
+
+    gfits_compress_image (&temp_header, &temp_matrix, &ftable, NULL, "GZIP_1");
+    gfits_byteswap_varlength_column (&ftable, 1);
+    
+    gfits_fwrite_Theader (f, &theader);
+    gfits_fwrite_table  (f, &ftable);
+    fclose (f);
+
+    gfits_free_header (&theader);
+    gfits_free_table (&ftable);
+    return (TRUE);
+  }
+
   /* the actual write-to-disk goes here */
   if (!gfits_write_header (argv[2], &temp_header)) {

branches/eam_branches/ohana.20150429/src/opihi/cmd.data/write_vectors.c

@@ -3 +3 @@
 int write_vectors (int argc, char **argv) {
   
-  int append;
   int i, j, Nvec, Ne, N;
   FILE *f;
   char **fmtlist, *fmttype;
-  char *p0, *p1, *p2, *format, *FITS;
+  char *p0, *p1, *p2, *format;
   Vector **vec;
 
@@ -34 +33 @@
 
   /* option generate a FITS output table */
-  FITS = NULL;
+  char *FITS = NULL;
   if ((N = get_argument (argc, argv, "-fits"))) {
     remove_argument (N, &argc, argv);
@@ -58 +57 @@
   }
 
-  append = FALSE;
+  int append = FALSE;
   if ((N = get_argument (argc, argv, "-append"))) {
     remove_argument (N, &argc, argv);
     append = TRUE;
+  }
+
+  int compress = FALSE;
+  if ((N = get_argument (argc, argv, "-compress"))) {
+    remove_argument (N, &argc, argv);
+    compress = TRUE;
+    if (!FITS) {
+      fprintf (stderr, "NOTE: write_vectors -compress has no effect on non-FITS\n");
+    }
   }
 
@@ -105 +113 @@
 
   if (FITS) {
-    int status = WriteVectorTableFITS (argv[1], FITS, vec, Nvec, append, format);
+    int status = WriteVectorTableFITS (argv[1], FITS, vec, Nvec, append, compress, format);
     free (vec);
     return status;