Changeset 7080 for trunk/Ohana/src/misc/src/ftable.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/misc/src/ftable.c (modified) (13 diffs)

trunk/Ohana/src/misc/src/ftable.c

@@ -83 +83 @@
 
   Binary = FALSE;
-  fits_scan (table.header, "XTENSION", "%s", 1, ttype);
+  gfits_scan (table.header, "XTENSION", "%s", 1, ttype);
   if (!strcmp (ttype, "BINTABLE")) Binary = TRUE;
 
   /* load table data array */
-  Nbytes = fits_matrix_size (table.header);
+  Nbytes = gfits_matrix_size (table.header);
   ALLOCATE (table.buffer, char, Nbytes);
   Nread = fread (table.buffer, sizeof (char), Nbytes, f);
@@ -96 +96 @@
   table.size = Nbytes;
 
-  fits_scan (table.header, "NAXIS1",  "%d", 1, &Nx);
-  fits_scan (table.header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (table.header, "NAXIS1",  "%d", 1, &Nx);
+  gfits_scan (table.header, "NAXIS2",  "%d", 1, &Ny);
 
   /* print a column */
@@ -125 +125 @@
   char field[16], type[16], format[16], *line;
 
-  fits_scan (header, "NAXIS1",  "%d", 1, &Nx);
-  fits_scan (header, "TFIELDS", "%d", 1, &Nfields);
+  gfits_scan (header, "NAXIS1",  "%d", 1, &Nx);
+  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
 
   /* assume we have one space per byte column */
@@ -134 +134 @@
   for (i = 1; i <= Nfields; i++) {
     sprintf (field, "TFORM%d", i);
-    fits_scan (header, field, "%s", 1, format); /* get field format */
-    fits_table_format (format, type, &Nvals, &Nbytes);    /* convert to c-style */
+    gfits_scan (header, field, "%s", 1, format); /* get field format */
+    gfits_table_format (format, type, &Nvals, &Nbytes);    /* convert to c-style */
     memcpy (&line[Oout], &row[Oin], Nvals*Nbytes);
     for (j = 0; j < Nvals*Nbytes; j++) if (line[Oout+j] == 0) line[Oout+j] = ' ';
@@ -170 +170 @@
   }
 
-  if (!fits_fread_header (f, &header)) {
+  if (!gfits_fread_header (f, &header)) {
     fprintf (stderr, "can't read header from %s\n", file);
     exit (1);
@@ -176 +176 @@
 
   extend = FALSE;
-  fits_scan (&header, "EXTEND", "%t", 1, &extend);
+  gfits_scan (&header, "EXTEND", "%t", 1, &extend);
   if (!extend) {
     fprintf (stderr, "no extensions listed in file\n");
   }
 
-  Nbytes = fits_matrix_size (&header);
+  Nbytes = gfits_matrix_size (&header);
   fseek (f, Nbytes, SEEK_CUR);
 
-  while (fits_fread_header (f, &header)) {
-    fits_scan (&header, "EXTNAME", "%s", 1, extname);
-    fits_scan (&header, "NAXIS1",  "%d", 1, &Nx);
-    fits_scan (&header, "NAXIS2",  "%d", 1, &Ny);
+  while (gfits_fread_header (f, &header)) {
+    gfits_scan (&header, "EXTNAME", "%s", 1, extname);
+    gfits_scan (&header, "NAXIS1",  "%d", 1, &Nx);
+    gfits_scan (&header, "NAXIS2",  "%d", 1, &Ny);
     fprintf (stdout, "%-30s %6d %6d\n", extname, Nx, Ny);
 
-    Nbytes = fits_matrix_size (&header);
+    Nbytes = gfits_matrix_size (&header);
     fseek (f, Nbytes, SEEK_CUR);
   }
@@ -211 +211 @@
 
   /* read PHU */
-  if (!fits_fread_header (f, header)) {
+  if (!gfits_fread_header (f, header)) {
     fprintf (stderr, "can't read header from %s\n", file);
     exit (1);
@@ -218 +218 @@
   /* check for existence of extensions */
   extend = FALSE;
-  fits_scan (header, "EXTEND", "%t", 1, &extend);
+  gfits_scan (header, "EXTEND", "%t", 1, &extend);
   if (!extend) {
     fprintf (stderr, "no extensions listed in file\n");
@@ -224 +224 @@
 
   /* skip first data array */
-  Nbytes = fits_matrix_size (header);
+  Nbytes = gfits_matrix_size (header);
   fseek (f, Nbytes, SEEK_CUR);
 
   /* search for extension of interest */
-  for (i = 0; fits_fread_Theader (f, header); i++) {
+  for (i = 0; gfits_fread_Theader (f, header); i++) {
     if ((Extname == NULL) && (Nextend == i)) return (f);
 
-    fits_scan (header, "EXTNAME", "%s", 1, extname);
+    gfits_scan (header, "EXTNAME", "%s", 1, extname);
     if ((Extname != NULL) && (!strcmp (Extname, extname))) return (f);
 
-    Nbytes = fits_matrix_size (header);
+    Nbytes = gfits_matrix_size (header);
     fseek (f, Nbytes, SEEK_CUR);
-    fits_free_header (header);
+    gfits_free_header (header);
   }
   fclose (f);
@@ -255 +255 @@
   data   =  table[0].buffer;
 
-  fits_scan (header, "TFIELDS", "%d", 1, &Nfields);
-  fits_scan (header, "NAXIS1",  "%d", 1, &Nx);
-  fits_scan (header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
+  gfits_scan (header, "NAXIS1",  "%d", 1, &Nx);
+  gfits_scan (header, "NAXIS2",  "%d", 1, &Ny);
 
   if (Colname != (char *) NULL) {
@@ -263 +263 @@
     for (i = 1; i <= Nfields; i++) {
       sprintf (field, "TTYPE%d", i);
-      fits_scan (header, field, "%s", 1, type);
+      gfits_scan (header, field, "%s", 1, type);
       if (!strcmp (type, Colname)) {
         Column = i;
@@ -285 +285 @@
   for (i = 1; i < Column; i++) {
     sprintf (field, "TFORM%d", i);
-    fits_scan (header, field, "%s", 1, format);
+    gfits_scan (header, field, "%s", 1, format);
     if (Binary) 
-      fits_table_format (format, type, &Nv, &Nb);
+      gfits_table_format (format, type, &Nv, &Nb);
     else 
-      fits_bintable_format (format, type, &Nv, &Nb);
+      gfits_bintable_format (format, type, &Nv, &Nb);
     Nstart += Nv*Nb;
   }
 
   sprintf (field, "TFORM%d", Column);
-  fits_scan (header, field, "%s", 1, format);
+  gfits_scan (header, field, "%s", 1, format);
   if (Binary) 
-    fits_bintable_format (format, type, &Nv, &Nb);    /* convert to c-style */
+    gfits_bintable_format (format, type, &Nv, &Nb);    /* convert to c-style */
   else 
-    fits_table_format (format, type, &Nv, &Nb);    /* convert to c-style */
+    gfits_table_format (format, type, &Nv, &Nb);    /* convert to c-style */
 
   ALLOCATE (line, char, Nv*Nb + 1);
 
   if (Binary) {
-    if (!fits_get_bintable_column_type (header, Colname, type, &Nv)) return;
+    if (!gfits_get_bintable_column_type (header, Colname, type, &Nv)) return;
     if (!strcmp (type, "char")) return;
-    if (!fits_get_bintable_column (header, table, Colname, (void **)&data)) return;
+    if (!gfits_get_bintable_column (header, table, Colname, (void **)&data)) return;
 
     for (i = 0; i < Ny; i++) {
@@ -344 +344 @@
   char field[16], type[80], comment[80], format[80], unit[80], null[80], nval[80];
 
-  fits_scan (header, "TFIELDS", "%d", 1, &Nfields);
+  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
 
   for (i = 1; i <= Nfields; i++) {
     sprintf (field, "TTYPE%d", i);
-    fits_scan (header, field, "%s", 1, type);
-    fits_scan (header, field, "%C", 1, comment);
+    gfits_scan (header, field, "%s", 1, type);
+    gfits_scan (header, field, "%C", 1, comment);
     sprintf (field, "TFORM%d", i);
-    fits_scan (header, field, "%s", 1, format);
+    gfits_scan (header, field, "%s", 1, format);
     sprintf (field, "TUNIT%d", i);
-    fits_scan (header, field, "%s", 1, unit);
+    gfits_scan (header, field, "%s", 1, unit);
     sprintf (field, "TNULL%d", i);
-    if (!fits_scan (header, field, "%s", 1, null)) strcpy (null, "none");
+    if (!gfits_scan (header, field, "%s", 1, null)) strcpy (null, "none");
     sprintf (field, "TNVAL%d", i);
-    if (!fits_scan (header, field, "%s", 1, nval)) strcpy (nval, "none");
+    if (!gfits_scan (header, field, "%s", 1, nval)) strcpy (nval, "none");
 
     fprintf (stdout, "%-18s %-32s %-18s %-6s %-8s %-8s\n",