Changeset 7054 for trunk/Ohana/src/libfits/table/F_set_column.c

Timestamp:

May 3, 2006, 12:01:09 PM (20 years ago)

Author:

eugene

Message:

converted fits_ to gfits_

File:

• trunk/Ohana/src/libfits/table/F_set_column.c (modified) (8 diffs)

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

@@ -13 +13 @@
 
 /***********************/
-int fits_set_bintable_column (Header *header, FTable *table, char *label, void *data, int Nrow) {
+int gfits_set_bintable_column (Header *header, FTable *table, char *label, void *data, int Nrow) {
 
   int i, N, Nfields, Nval, Nbytes, Nx, Ny, nbytes, Nstart, Nv, Nb;
@@ -26 +26 @@
   /* find label in header */
   tlabel[0] = 0;
-  fits_scan (header, "TFIELDS", "%d", 1, &Nfields);
+  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
   for (i = 1; strcmp (label, tlabel) && (i < Nfields + 1); i++) {
     sprintf (field, "TTYPE%d", i);
-    fits_scan (header, field, "%s", 1, tlabel);
+    gfits_scan (header, field, "%s", 1, tlabel);
   }
   if (strcmp (label, tlabel)) return (FALSE);
@@ -36 +36 @@
   /* interpret format */
   sprintf (field, "TSCAL%d", N);
-  fits_scan (header, field, "%lf", 1, &Bscale);
+  gfits_scan (header, field, "%lf", 1, &Bscale);
   sprintf (field, "TZERO%d", N);
-  fits_scan (header, field, "%lf", 1, &Bzero);
+  gfits_scan (header, field, "%lf", 1, &Bzero);
   sprintf (field, "TFORM%d", N);
-  fits_scan (header, field, "%s", 1, format);
-
-  if (!fits_bintable_format (format, type, &Nval, &Nbytes)) return (FALSE);
+  gfits_scan (header, field, "%s", 1, format);
+
+  if (!gfits_bintable_format (format, type, &Nval, &Nbytes)) return (FALSE);
   
   /* check existing table dimensions */
-  fits_scan (header, "NAXIS1",  "%d", 1, &Nx);
-  fits_scan (header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (header, "NAXIS1",  "%d", 1, &Nx);
+  gfits_scan (header, "NAXIS2",  "%d", 1, &Ny);
   if (Ny == 0) { 
     Ny = Nrow;
     header[0].Naxis[1] = Ny;
-    fits_modify (header, "NAXIS2",  "%d", 1, Ny);
-
-    nbytes = fits_matrix_size (header);
+    gfits_modify (header, "NAXIS2",  "%d", 1, Ny);
+
+    nbytes = gfits_matrix_size (header);
     REALLOCATE (table[0].buffer, char, MAX (nbytes, 1));
     bzero (table[0].buffer, nbytes);
@@ -63 +63 @@
   for (i = 1; i < N; i++) {
     sprintf (field, "TFORM%d", i);
-    fits_scan (header, field, "%s", 1, format);
-    fits_bintable_format (format, tmpline, &Nv, &Nb);
+    gfits_scan (header, field, "%s", 1, format);
+    gfits_bintable_format (format, tmpline, &Nv, &Nb);
     Nstart += Nv*Nb;
   }
@@ -153 +153 @@
 
 /***********************/
-int fits_set_table_column (Header *header, FTable *table, char *label, void *data, int Nrow) {
+int gfits_set_table_column (Header *header, FTable *table, char *label, void *data, int Nrow) {
 
   int i, N, Nfields, Nval, Nbytes, Nx, Ny, nbytes, Nstart, Nv, Nb;
@@ -164 +164 @@
   /* find label in header */
   tlabel[0] = 0;
-  fits_scan (header, "TFIELDS", "%d", 1, &Nfields);
+  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
   for (i = 1; strcmp (label, tlabel) && (i < Nfields + 1); i++) {
     sprintf (field, "TTYPE%d", i);
-    fits_scan (header, field, "%s", 1, tlabel);
+    gfits_scan (header, field, "%s", 1, tlabel);
   }
   if (strcmp (label, tlabel)) return (FALSE);
@@ -174 +174 @@
   /* interpret format */
   sprintf (field, "TFORM%d", N);
-  fits_scan (header, field, "%s", 1, format);
-
-  if (!fits_table_format (format, type, &Nval, &Nbytes)) return (FALSE);
+  gfits_scan (header, field, "%s", 1, format);
+
+  if (!gfits_table_format (format, type, &Nval, &Nbytes)) return (FALSE);
   strcpy (cformat, format);
   
   /* check existing table dimensions */
-  fits_scan (header, "NAXIS1",  "%d", 1, &Nx);
-  fits_scan (header, "NAXIS2",  "%d", 1, &Ny);
+  gfits_scan (header, "NAXIS1",  "%d", 1, &Nx);
+  gfits_scan (header, "NAXIS2",  "%d", 1, &Ny);
   if (Ny == 0) { 
     Ny = Nrow;
     header[0].Naxis[1] = Ny;
-    fits_modify (header, "NAXIS2",  "%d", 1, Ny);
-
-    nbytes = fits_matrix_size (header);
+    gfits_modify (header, "NAXIS2",  "%d", 1, Ny);
+
+    nbytes = gfits_matrix_size (header);
     REALLOCATE (table[0].buffer, char, MAX (nbytes, 1));
     bzero (table[0].buffer, nbytes);
@@ -198 +198 @@
   for (i = 1; i < N; i++) {
     sprintf (field, "TFORM%d", i);
-    fits_scan (header, field, "%s", 1, format);
-    fits_table_format (format, tmp, &Nv, &Nb);
+    gfits_scan (header, field, "%s", 1, format);
+    gfits_table_format (format, tmp, &Nv, &Nb);
     Nstart += Nv*Nb;
   }