Changeset 38441 for trunk/Ohana/src/opihi/cmd.data/read_vectors.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/cmd.data (modified) (1 prop)
• src/opihi/cmd.data/read_vectors.c (modified) (11 diffs)

trunk/Ohana/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;
 
-  /* 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. 
@@ -429 +431 @@
     }
     if (!gfits_load_header (f, &header)) ESCAPE ("error reading header for extension %d\n", Nextend);
-
-    if (getSizes) {
-      read_table_sizes (&header);
-      if (CCDKeyword != NULL) free (CCDKeyword); 
-      gfits_free_header (&header); 
-      return TRUE;
-    }
-
-    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) {
@@ -460 +438 @@
       CCDKeyword = strcreate ("EXTNAME");
     }
-
     while (1) {
       if (!gfits_load_header (f, &header)) {
@@ -469 +446 @@
         return (TRUE);  
       }
-
       Nbytes = gfits_data_size (&header);
 
@@ -482 +458 @@
         continue;
       }
-
-      if (getSizes) {
-        read_table_sizes (&header);
-        if (CCDKeyword != NULL) free (CCDKeyword); 
-        gfits_free_header (&header); 
-        return TRUE;
-      }
-
-      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);
-
-      // if (!gfits_fread_ftable_data (f, &table, padIfShort)) ESCAPE ("error reading table for extension\n");
-
       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 ("OFF_T_FMT")\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 "OFF_T_FMT" 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);
   }
 
@@ -518 +512 @@
   Binary = !strcmp (type, "BINTABLE");
   Ny = header.Naxis[1];
+
+  Header *outheader = &header;
+  FTable *outtable  = &table;
+
+  Header rawheader;
+  FTable rawtable;
+  if (IsCompressed) {
+    rawtable.header = &rawheader;
+
+    dump_cmp_table (&table, "rd cmp");
+
+    int Nfields;
+    if (!gfits_scan (&header, "TFIELDS", "%d", 1, &Nfields)) ESCAPE ("cannot find TFIELDS in header\n");
+    for (i = 0; i < Nfields; i++) {
+      gfits_byteswap_varlength_column (&table, i+1);
+    }
+    if (!gfits_uncompress_table (&table, &rawtable)) ESCAPE ("failed to uncompress table\n");
+    dump_raw_table (&rawtable, "rd raw");
+
+    outheader = &rawheader;
+    outtable  = &rawtable;
+    gfits_free_header (&header);
+    gfits_free_table (&table);
+    Ny = rawheader.Naxis[1];
+  }
 
   /* find columns which match requested vectors */
@@ -527 +546 @@
     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\n");
+      if (!gfits_get_bintable_column_raw (outheader, outtable, argv[i], &data, IsCompressed)) ESCAPE ("error reading data from specified field\n");
     } 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 (Nval == 0) ESCAPE ("no data for field in table");
+      if (!gfits_get_table_column_type (outheader, argv[i], type)) ESCAPE ("requested field not found\n");
+      if (!gfits_get_table_column (outheader, outtable, argv[i], &data)) ESCAPE ("error reading data from specified field\n");
+    }
+    if (Nval == 0) ESCAPE ("no data for field in table\n");
     
     vecType = OPIHI_INT;
-    if (!strcmp (type, "double") || !strcmp (type, "float")) {
+    if (!strcmp (type, "double") || !strcmp (type, "float") || !strcmp (type, "int64_t")) {
       vecType = OPIHI_FLT;
     }
@@ -570 +589 @@
         else
           sprintf (name, "%s:%d", argv[i], j);
-        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
+        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name\n");
         ResetVector (vec[j], vecType, Ny);
       }
 
-      if (!VectorAssignData (vec, type, data, Ny, Nval)) ESCAPE ("bad column type %s", type);
+      if (!VectorAssignData (vec, type, data, Ny, Nval)) ESCAPE ("bad column type %s\n", type);
 
     } else {
@@ -584 +603 @@
         else
           sprintf (name, "%s:%d", argv[i], j);
-        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
+        if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name\n");
         ResetVector (vec[j], vecType, Nval);
       }
 
-      if (!VectorAssignDataTranspose (vec, type, data, Ny, Nval)) ESCAPE ("bad column type %s", type);
+      if (!VectorAssignDataTranspose (vec, type, data, Ny, Nval)) ESCAPE ("bad column type %s\n", type);
     }
     free (data);
@@ -594 +613 @@
   }
   if (CCDKeyword != NULL) free (CCDKeyword);
-  gfits_free_table (&table);
-  gfits_free_header (&header);
+  gfits_free_table (outtable);
+  gfits_free_header (outheader);
   return (TRUE);
 }