Changeset 15487 for trunk/Ohana/src/opihi/cmd.data/read_vectors.c

Timestamp:

Nov 6, 2007, 5:09:52 PM (19 years ago)

Author:

eugene

Message:

merging changes from eam_branch_20071015 (read compressed images, clean addstar I/O, other minor issues)

File:

• trunk/Ohana/src/opihi/cmd.data/read_vectors.c (modified) (5 diffs)

trunk/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -150 +150 @@
 int read_table_vectors (int argc, char **argv, char *extname) {
 
-  int i, j, k, Nbytes, Nread, Nextend, Ny, Binary;
-  char type[16];
+  int i, j, k, N, Nbytes, Nread, Nextend, Ny, Binary;
+  char type[16], ID[80], *CCDKeyword;
   FTable table;
   Header header;
   Vector **vec;
 
+  table.buffer = NULL;
+  header.buffer = NULL;
+
+  CCDKeyword = NULL;
+  if ((N = get_argument (argc, argv, "-keyword"))) {
+    remove_argument (N, &argc, argv);
+    CCDKeyword = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  Nextend = -1;
+  if ((N = get_argument (argc, argv, "-extnum"))) {
+    remove_argument (N, &argc, argv);
+    Nextend = atoi (extname);
+  }
+
   if (argc < 2) {
-    gprint (GP_ERR, "USAGE: read -fits extension name name ...\n");
+    gprint (GP_ERR, "USAGE: read -fits extension [-extnum] [-keyword key] name name ...\n");
     gprint (GP_ERR, "  ('extension' may be a name or number)\n");
-    return (FALSE);
-  }
-
-  if (f == (FILE *) NULL) return (FALSE);
+    goto escape;
+  }
+
+  if (f == (FILE *) NULL) goto escape;
   fseek (f, 0, SEEK_SET);
   table.header = &header;
 
   /* load appropriate extension (if extname is a number, use count) */
-  if (isdigit(extname[0])) {
-    Nextend = atoi (extname);
-
-    for (i = 0; i <= Nextend; i++) {
-      if (!gfits_load_header (f, &header)) return (FALSE);
-      Nbytes = gfits_matrix_size (&header);
+  if (Nextend > -1) {
+    // first extension is PHU, cannot be a table. 
+    // Nextend counts from 0 for first extension
+    if (!gfits_load_header (f, &header)) goto escape;
+    Nbytes = gfits_data_size (&header);
+    fseek (f, Nbytes, SEEK_CUR);
+    gfits_free_header (&header);
+
+    for (i = 0; i < Nextend; i++) {
+      if (!gfits_load_header (f, &header)) goto escape;
+      Nbytes = gfits_data_size (&header);
       /* skip the prior data buffers */
-      if (i < Nextend) { 
+      fseek (f, Nbytes, SEEK_CUR);
+      gfits_free_header (&header);
+    }
+    if (!gfits_load_header (f, &header)) goto escape;
+    if (!gfits_fread_ftable_data (f, &table)) goto escape;
+
+  } else {
+    if (CCDKeyword == NULL) {
+      CCDKeyword = get_variable ("CCDKEYWORD");
+    }
+    if (CCDKeyword == NULL) {
+      CCDKeyword = strcreate ("EXTNAME");
+    }
+
+    while (1) {
+      if (!gfits_load_header (f, &header)) goto escape;
+      Nbytes = gfits_data_size (&header);
+
+      if (!gfits_scan (&header, CCDKeyword, "%s", 1, ID)) {
         fseek (f, Nbytes, SEEK_CUR);
         gfits_free_header (&header);
         continue;
       }
-      /* on the desired header, load buffer */
-      ALLOCATE (table.buffer, char, Nbytes);
-      Nread = fread (table.buffer, sizeof (char), Nbytes, f);
-      if (Nread != Nbytes) {
-        gfits_free_table  (&table);
+      if (strcmp (ID, extname)) {
+        fseek (f, Nbytes, SEEK_CUR);
         gfits_free_header (&header);
-        return (FALSE);
-      }
-      table.size = Nbytes;
-    }
-  } else {
-    if (!gfits_fread_ftable (f, &table, extname)) return (FALSE);
+        continue;
+      }
+      if (!gfits_fread_ftable_data (f, &table)) goto escape;
+      break;
+    }
   }
 
@@ -196 +231 @@
   Binary = FALSE;
   gfits_scan (&header, "XTENSION", "%s", 1, type);
-  if (!strcmp (type, "BINTABLE")) {
-    Binary = TRUE;
-  } 
+  if (strcmp (type, "BINTABLE") && strcmp (type, "TABLE")) {
+    gprint (GP_ERR, "specified extension (%s) is not a table\n", extname);
+    goto escape;
+  }
+  Binary = !strcmp (type, "BINTABLE");
   Ny = header.Naxis[1];
 
@@ -214 +251 @@
     Nval = 0;
     if (Binary) {
-      if (!gfits_get_bintable_column_type (&header, argv[i], type, &Nval)) return (FALSE);
-      if (!gfits_get_bintable_column (&header, &table, argv[i], &data)) return (FALSE);
+      if (!gfits_get_bintable_column_type (&header, argv[i], type, &Nval)) goto escape;
+      if (!gfits_get_bintable_column (&header, &table, argv[i], &data)) goto escape;
     } else {
-      if (!gfits_get_table_column_type (&header, argv[i], type)) return (FALSE);
-      if (!gfits_get_table_column (&header, &table, argv[i], &data)) return (FALSE);
-    }
-    if (Nval == 0) return (FALSE);
+      if (!gfits_get_table_column_type (&header, argv[i], type)) goto escape;
+      if (!gfits_get_table_column (&header, &table, argv[i], &data)) goto escape;
+    }
+    if (Nval == 0) goto escape;
 
     ALLOCATE (vec, Vector *, Nval);
@@ -228 +265 @@
       else
         sprintf (name, "%s:%d", argv[i], j);
-      if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) return (FALSE);    
+      if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) goto escape;
       REALLOCATE (vec[j][0].elements, float, MAX (Ny,1));
       vec[j][0].Nelements = Ny;
@@ -276 +313 @@
     free (vec);
   }
+  if (CCDKeyword != NULL) free (CCDKeyword);
   gfits_free_table (&table);
   gfits_free_header (&header);
   return (TRUE);
+
+escape:
+  if (CCDKeyword != NULL) free (CCDKeyword);
+  gfits_free_table  (&table);
+  gfits_free_header (&header);
+  return (FALSE);
 }