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

Timestamp:

May 5, 2006, 5:44:26 PM (20 years ago)

Author:

eugene

Message:

big move: fits_ to gfits_; minor updates to relphot

File:

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

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

@@ -171 +171 @@
 
     for (i = 0; i <= Nextend; i++) {
-      if (!fits_load_header (f, &header)) return (FALSE);
-      Nbytes = fits_matrix_size (&header);
+      if (!gfits_load_header (f, &header)) return (FALSE);
+      Nbytes = gfits_matrix_size (&header);
       /* skip the prior data buffers */
       if (i < Nextend) { 
         fseek (f, Nbytes, SEEK_CUR);
-        fits_free_header (&header);
+        gfits_free_header (&header);
         continue;
       }
@@ -183 +183 @@
       Nread = fread (table.buffer, sizeof (char), Nbytes, f);
       if (Nread != Nbytes) {
-        fits_free_table  (&table);
-        fits_free_header (&header);
+        gfits_free_table  (&table);
+        gfits_free_header (&header);
         return (FALSE);
       }
@@ -190 +190 @@
     }
   } else {
-    if (!fits_fread_ftable (f, &table, extname)) return (FALSE);
+    if (!gfits_fread_ftable (f, &table, extname)) return (FALSE);
   }
 
   /* identify table type (ascii / binary) */
   Binary = FALSE;
-  fits_scan (&header, "XTENSION", "%s", 1, type);
+  gfits_scan (&header, "XTENSION", "%s", 1, type);
   if (!strcmp (type, "BINTABLE")) {
     Binary = TRUE;
@@ -214 +214 @@
     Nval = 0;
     if (Binary) {
-      if (!fits_get_bintable_column_type (&header, argv[i], type, &Nval)) return (FALSE);
-      if (!fits_get_bintable_column (&header, &table, argv[i], &data)) return (FALSE);
+      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);
     } else {
-      if (!fits_get_table_column_type (&header, argv[i], type)) return (FALSE);
-      if (!fits_get_table_column (&header, &table, argv[i], &data)) return (FALSE);
+      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);
@@ -276 +276 @@
     free (vec);
   }
-  fits_free_table (&table);
-  fits_free_header (&header);
+  gfits_free_table (&table);
+  gfits_free_header (&header);
   return (TRUE);
 }