Changeset 15487 for trunk/Ohana/src/libfits/table/F_read_T.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/libfits/table/F_read_T.c (modified) (7 diffs)

trunk/Ohana/src/libfits/table/F_read_T.c

@@ -41 +41 @@
 
     /* skip to next header */
-    Nbytes = gfits_matrix_size (header);
+    Nbytes = gfits_data_size (header);
     fseek (f, Nbytes, SEEK_CUR);
     gfits_free_header (header);
@@ -54 +54 @@
 
   /* find buffer size */
-  Nbytes = gfits_matrix_size (table[0].header);
+  Nbytes = gfits_data_size (table[0].header);
   ALLOCATE (table[0].buffer, char, Nbytes);
 
@@ -75 +75 @@
   Nx = table[0].header[0].Naxis[0];
   Ny = table[0].header[0].Naxis[1];
-  table[0].size = gfits_matrix_size (table[0].header);
+  table[0].size = gfits_data_size (table[0].header);
   table[0].pad = table[0].size - Nx*Ny;
 
@@ -120 +120 @@
 
     /* find buffer size */
-    Nbytes = gfits_matrix_size (header);
+    Nbytes = gfits_data_size (header);
 
     /* check if this is the correct extension or not */
@@ -152 +152 @@
     ALLOCATE (table[0].row, int, MAX (1, Nrow));    
     for (i = 0; i < Nrow; i++) table[0].row[i] = row[i];
-    table[0].size   = gfits_matrix_size (table[0].header);
+    table[0].size   = gfits_data_size (table[0].header);
     table[0].pad    = table[0].size - Nx*Ny;
     return (TRUE);
   }
 }       
-
-# if (0)
-/*********************** fits read table ***********************************/
-/* a poor function: read only the first table, regardless of name */
-/* keep until we are sure ohana code does not use it  */
-int gfits_read_table (char *filename, FTable *table) {
-
-  FILE *f;
-  Header header;
-  int status, i, nbytes, Nbytes, matrix_size;
-
-  if (!gfits_read_header (filename, &header)) {
-    fprintf (stderr, "error reading header of FITS file %s\n", filename);
-    return (FALSE);
-  }
-
-  if (!gfits_read_Theader (filename, &table[0].header)) {
-    fprintf (stderr, "error reading Theader of FITS file %s\n", filename);
-    return (FALSE);
-  }
-
-  if ((f = fopen (filename, "r")) == NULL) {
-    gfits_free_header (&header);
-    gfits_free_header (&table[0].header);
-    return (FALSE);
-  }
-
-  matrix_size = gfits_matrix_size (&header);
-
-  Nbytes = header.size + matrix_size + table[0].header.size;
-  fseek (f, Nbytes, 0);
-  gfits_free_header (&header);
- 
-  gfits_scan (&table[0].header, "TFIELDS", "%d", 1, &table[0].Nfields);
-
-  /* place the field sizes in the structure? */
-  table[0].bitpix = table[0].header.bitpix;
-  table[0].Naxes  = table[0].header.Naxes;
-  for (i = 0; i < FT_MAX_NAXES; i++)
-    table[0].Naxis[i] = table[0].header.Naxis[i];
-
-  Nbytes = gfits_matrix_size (&table[0].header);
-  ALLOCATE (table[0].buffer, char, Nbytes);
-  nbytes = fread (table[0].buffer, sizeof(char), Nbytes, f);
-  if (nbytes != Nbytes) {
-    fprintf (stderr, "error reading in table data from FITS file %s\n", filename);
-    fclose (f);
-    return (FALSE);
-  }
-  table[0].size = Nbytes;
-  fclose (f);
-  return (TRUE);
-}
-# endif
-
 
 int gfits_fread_header_extname (FILE *f, Header *header, char *extname) {
@@ -223 +168 @@
   if (!strcasecmp (extname, "PHU")) return (TRUE);
 
-  Nbytes = gfits_matrix_size (header);
+  Nbytes = gfits_data_size (header);
   fseek (f, Nbytes, SEEK_CUR);
 
@@ -229 +174 @@
     gfits_scan (header, "EXTNAME", "%s", 1, current);
     if (!strcmp (current, extname)) return (TRUE);
-    Nbytes = gfits_matrix_size (header);
+    Nbytes = gfits_data_size (header);
     fseek (f, Nbytes, SEEK_CUR);
   }