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

Timestamp:

May 30, 2015, 7:59:48 PM (11 years ago)

Author:

eugene

Message:

more work on compression : cfitsio assumes gzip, not zlib (I have made uncompress general )

Location:

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

Files:

• rd.c (modified) (3 diffs)
• read_vectors.c (modified) (8 diffs)
• wd.c (modified) (1 diff)
• write_vectors.c (modified) (1 diff)

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

@@ -85 +85 @@
       return (FALSE);
     }
-    if (gfits_extension_is_compressed (&buf[0].header)) {
+    if (gfits_extension_is_compressed_image (&buf[0].header)) {
         IsCompressed = TRUE;
     }
@@ -118 +118 @@
       Nword = 1;
       IsCompressed = FALSE;
-      if (gfits_extension_is_compressed (&buf[0].header)) {
+      if (gfits_extension_is_compressed_image (&buf[0].header)) {
         if (!strcmp (CCDKeyword, "EXTNAME")) Nword = 1;
         IsCompressed = TRUE;
@@ -194 +194 @@
 
     if (!gfits_fread_ftable_data (f, &ftable, FALSE)) { fprintf (stderr, "problem reading compressed image table data\n"); fclose (f); return FALSE; }
-    fprintf (stderr, "rd 1: ");
-    for (i = 0; i < 32; i++) {
-      fprintf (stderr, "0x%0hhx ", ftable.buffer[i]);
-    }
-    fprintf (stderr, "\n");
-  
     if (!gfits_byteswap_varlength_column (&ftable, 1)) { fprintf (stderr, "problem doing byteswap on compressed image metadata column\n"); fclose (f); gfits_free_table (&ftable); return FALSE; }
-    fprintf (stderr, "rd 2: ");
-    for (i = 0; i < 32; i++) {
-      fprintf (stderr, "0x%0hhx ", ftable.buffer[i]);
-    }
-    fprintf (stderr, "\n");
-
     if (!gfits_uncompress_image (&buf[0].header, &buf[0].matrix, &ftable)) { fprintf (stderr, "problem uncompressing the image data\n"); fclose (f); gfits_free_table (&ftable); return FALSE; }
 

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

@@ -412 +412 @@
   table.header = &header;
 
+  int IsCompressed = FALSE;
+
   /* load appropriate extension (if extname is a number, use count) */
   if (Nextend > -1) {
@@ -430 +432 @@
     if (!gfits_load_header (f, &header)) ESCAPE ("error reading header for extension %d\n", Nextend);
 
-    if (getSizes) {
+    IsCompressed = gfits_extension_is_compressed_table (&header);
+
+    if (getSizes && !IsCompressed) {
       read_table_sizes (&header);
       if (CCDKeyword != NULL) free (CCDKeyword); 
       gfits_free_header (&header); 
       return TRUE;
+    }
+    if (IsCompressed) {
+      if (getSizes) {
+        gprint (GP_ERR, "%s[%s] is compressed: -sizes is invalid\n", filename, extname);
+        gfits_free_header (&header); 
+        return FALSE;
+      }
+      if ((start > 0) || (Nrows > -1)) {
+        gprint (GP_ERR, "%s[%s] is compressed: must read entire table\n", filename, extname);
+        gfits_free_header (&header); 
+        return FALSE;
+      }
     }
 
@@ -483 +499 @@
       }
 
-      if (getSizes) {
+      IsCompressed = gfits_extension_is_compressed_table (&header);
+
+      if (getSizes && !IsCompressed) {
         read_table_sizes (&header);
         if (CCDKeyword != NULL) free (CCDKeyword); 
@@ -489 +507 @@
         return TRUE;
       }
+      if (IsCompressed) {
+        if (getSizes) {
+          gprint (GP_ERR, "%s[%s] is compressed: -sizes is invalid\n", filename, extname);
+          gfits_free_header (&header); 
+          return FALSE;
+        }
+        if ((start > 0) || (Nrows > -1)) {
+          gprint (GP_ERR, "%s[%s] is compressed: must read entire table\n", filename, extname);
+          gfits_free_header (&header); 
+          return FALSE;
+        }
+      }
 
       if (Nrows == -1) {
@@ -503 +533 @@
 
       if (!gfits_fread_ftable_range (f, padIfShort, &table, start, Nrows)) ESCAPE ("error reading table for extension %d\n", Nextend);
-
-      // if (!gfits_fread_ftable_data (f, &table, padIfShort)) ESCAPE ("error reading table for extension\n");
-
       break;
     }
@@ -518 +545 @@
   Binary = !strcmp (type, "BINTABLE");
   Ny = header.Naxis[1];
+
+  Header *outheader = &header;
+  FTable *outtable  = &table;
+
+  Header rawheader;
+  FTable rawtable;
+  if (IsCompressed) {
+    rawtable.header = &rawheader;
+    if (!gfits_uncompress_table (&table, &rawtable)) ESCAPE ("failed to uncompress table");
+    outheader = &rawheader;
+    outtable  = &rawtable;
+    gfits_free_header (&header);
+    gfits_free_table (&table);
+    Ny = rawheader.Naxis[1];
+  }
 
   /* find columns which match requested vectors */
@@ -527 +569 @@
     Nval = 0;
     if (Binary) {
-      if (!gfits_get_bintable_column_type (&header, argv[i], type, &Nval)) ESCAPE ("requested field not found");
-      if (!gfits_get_bintable_column (&header, &table, argv[i], &data)) ESCAPE ("error reading data from specified field");
+      if (!gfits_get_bintable_column_type (outheader, argv[i], type, &Nval)) ESCAPE ("requested field not found");
+      if (!gfits_get_bintable_column (outheader, outtable, argv[i], &data)) ESCAPE ("error reading data from specified field");
     } else {
-      if (!gfits_get_table_column_type (&header, argv[i], type)) ESCAPE ("requested field not found");
-      if (!gfits_get_table_column (&header, &table, argv[i], &data)) ESCAPE ("error reading data from specified field");
+      if (!gfits_get_table_column_type (outheader, argv[i], type)) ESCAPE ("requested field not found");
+      if (!gfits_get_table_column (outheader, outtable, argv[i], &data)) ESCAPE ("error reading data from specified field");
     }
     if (Nval == 0) ESCAPE ("no data for field in table");
@@ -594 +636 @@
   }
   if (CCDKeyword != NULL) free (CCDKeyword);
-  gfits_free_table (&table);
-  gfits_free_header (&header);
+  gfits_free_table (outtable);
+  gfits_free_header (outheader);
   return (TRUE);
 }

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

@@ -205 +205 @@
     ftable.header = &theader;
 
-    int i;
     gfits_compress_image (&temp_header, &temp_matrix, &ftable, NULL, CompressMode);
-    fprintf (stderr, "wd 1: ");
-    for (i = 0; i < 32; i++) {
-      fprintf (stderr, "0x%0hhx ", ftable.buffer[i]);
-    }
-    fprintf (stderr, "\n");
-
     gfits_byteswap_varlength_column (&ftable, 1);
-    fprintf (stderr, "wd 2: ");
-    for (i = 0; i < 32; i++) {
-      fprintf (stderr, "0x%0hhx ", ftable.buffer[i]);
-    }
-    fprintf (stderr, "\n");
-    
     gfits_fwrite_Theader (f, &theader);
     gfits_fwrite_table  (f, &ftable);

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

@@ -63 +63 @@
   }
 
-  int compress = FALSE;
-  if ((N = get_argument (argc, argv, "-compress"))) {
-    remove_argument (N, &argc, argv);
-    compress = TRUE;
+  char *compress = NULL;
+  if ((N = get_argument (argc, argv, "-compress-mode"))) {
+    remove_argument (N, &argc, argv);
+    compress = strcreate(argv[N]);
+    remove_argument (N, &argc, argv);
+  } else if ((N = get_argument (argc, argv, "-compress"))) {
+    remove_argument (N, &argc, argv);
+    compress = strcreate("GZIP_1");
     if (!FITS) {
       fprintf (stderr, "NOTE: write_vectors -compress has no effect on non-FITS\n");