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

Timestamp:

May 31, 2015, 8:36:04 AM (11 years ago)

Author:

eugene

Message:

fix up compressed fits table I/O; add lrand, mrand, drand functions

Location:

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

Files:

• read_vectors.c (modified) (7 diffs)
• wd.c (modified) (4 diffs)

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

@@ -1 +1 @@
 # include "data.h"
+int dump_raw_table (FTable *table, char *message);
+int dump_cmp_table (FTable *table, char *message);
 
 FILE *f = (FILE *) NULL;
@@ -412 +414 @@
   table.header = &header;
 
-  int IsCompressed = FALSE;
-
-  /* load appropriate extension (if extname is a number, use count) */
+  /**** find the appropriate extension and read header (if extname is a number, use count) ****/
   if (Nextend > -1) {
     // first extension is PHU, cannot be a table. 
@@ -431 +431 @@
     }
     if (!gfits_load_header (f, &header)) ESCAPE ("error reading header for extension %d\n", Nextend);
-
-    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;
-      }
-    }
-
-    if (Nrows == -1) {
-      Nrows = header.Naxis[1] - start;
-    }
-    if (start < 0) ESCAPE ("invalid range: start < 0\n");
-    if (start >= header.Naxis[1]) ESCAPE ("invalid range: start >= Ny (%d)\n", header.Naxis[1]);
-    if (Nrows < 0) ESCAPE ("invalid range: Nrows < 0\n");
-
-    // just a warning:
-    if (start + Nrows > header.Naxis[1]) {
-      if (VERBOSE) gprint (GP_ERR, "NOTE: reading last block will return only %d rows\n", header.Naxis[1] - start);
-    }
-
-    // Ny = 100, start = 0, Nrows = -1 -> Nrows => 100
-    // Ny = 100, start = 10, Nrows = 90
-
-    if (!gfits_fread_ftable_range (f, padIfShort, &table, start, Nrows)) ESCAPE ("error reading table for extension %d\n", Nextend);
   } else {
     if (CCDKeyword == NULL) {
@@ -476 +438 @@
       CCDKeyword = strcreate ("EXTNAME");
     }
-
     while (1) {
       if (!gfits_load_header (f, &header)) {
@@ -485 +446 @@
         return (TRUE);  
       }
-
       Nbytes = gfits_data_size (&header);
 
@@ -498 +458 @@
         continue;
       }
-
-      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;
-        }
-      }
-
-      if (Nrows == -1) {
-        Nrows = header.Naxis[1] - start;
-      }
-      if (start < 0) ESCAPE ("invalid range: start < 0\n");
-      if (start >= header.Naxis[1]) ESCAPE ("invalid range: start >= Ny (%d)\n", header.Naxis[1]);
-      if (Nrows < 0) ESCAPE ("invalid range: Nrows < 0\n");
-
-      // just a warning:
-      if (start + Nrows > header.Naxis[1]) {
-        if (VERBOSE) gprint (GP_ERR, "NOTE: reading last block will return only %d rows\n", header.Naxis[1] - start);
-      }
-
-      if (!gfits_fread_ftable_range (f, padIfShort, &table, start, Nrows)) ESCAPE ("error reading table for extension %d\n", Nextend);
       break;
     }
+  }
+
+  int 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;
+    }
+  }
+
+  if (Nrows == -1) {
+    Nrows = header.Naxis[1] - start;
+  }
+  if (start < 0) ESCAPE ("invalid range: start < 0\n");
+  if (start >= header.Naxis[1]) ESCAPE ("invalid range: start >= Ny (%d)\n", header.Naxis[1]);
+  if (Nrows < 0) ESCAPE ("invalid range: Nrows < 0\n");
+
+  // just a warning:
+  if (start + Nrows > header.Naxis[1]) {
+    if (VERBOSE) gprint (GP_ERR, "NOTE: reading last block will return only %d rows\n", header.Naxis[1] - start);
+  }
+
+  // Ny = 100, start = 0, Nrows = -1 -> Nrows => 100
+  // Ny = 100, start = 10, Nrows = 90
+
+  if (IsCompressed) {
+    if (!gfits_fread_ftable_data (f, &table, padIfShort)) ESCAPE ("error reading table for extension %d\n", Nextend);
+  } else {
+    if (!gfits_fread_ftable_range (f, padIfShort, &table, start, Nrows)) ESCAPE ("error reading table for extension %d\n", Nextend);
   }
 
@@ -553 +520 @@
   if (IsCompressed) {
     rawtable.header = &rawheader;
+
+    dump_cmp_table (&table, "rd cmp");
     if (!gfits_uncompress_table (&table, &rawtable)) ESCAPE ("failed to uncompress table");
+    dump_raw_table (&rawtable, "rd raw");
+
     outheader = &rawheader;
     outtable  = &rawtable;

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

@@ -3 +3 @@
 int wd (int argc, char **argv) {
   
-  int N, Extend, Compress;
+  int N, Extend;
   int newUnsign, newBitpix, newScale, newZero;
   int outUnsign, outBitpix;
@@ -18 +18 @@
   }
 
-  Compress = FALSE;
-  if ((N = get_argument (argc, argv, "-compress"))) {
-    remove_argument (N, &argc, argv);
-    Compress = TRUE;
-  }
-
   char *CompressMode = NULL;
   if ((N = get_argument (argc, argv, "-compress-mode"))) {
@@ -29 +23 @@
     CompressMode = strcreate(argv[N]);
     remove_argument (N, &argc, argv);
-  }
-  if (!CompressMode) CompressMode = strcreate("GZIP_1");
+  } else if ((N = get_argument (argc, argv, "-compress"))) {
+    remove_argument (N, &argc, argv);
+    CompressMode = strcreate("GZIP_1");
+  }
 
   outZero = 0;
@@ -180 +176 @@
   
   // not compatible with extend
-  if (Compress) {
+  if (CompressMode) {
     Header myHeader;
     Matrix myMatrix;