Changeset 7080 for trunk/Ohana/src/opihi/dvo/cmpread.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/dvo/cmpread.c (modified) (7 diffs)

trunk/Ohana/src/opihi/dvo/cmpread.c

@@ -41 +41 @@
 
   /* load FITS header */
-  if (!fits_read_header (argv[2], &header)) {
+  if (!gfits_read_header (argv[2], &header)) {
     fprintf (stderr, "ERROR: can't read header for %s\n", argv[2]);
     return (FALSE);
@@ -49 +49 @@
     if (!GetCoords (&coords, &header)) {
       fprintf (stderr, "can't get WCS info from header\n");
-      fits_free_header (&header);
+      gfits_free_header (&header);
       return (FALSE);
     }
@@ -58 +58 @@
   if (f == NULL) {
     fprintf (stderr, "ERROR: can't read data from %s\n", argv[2]);
-    fits_free_header (&header);
+    gfits_free_header (&header);
     return (FALSE);
   }
@@ -64 +64 @@
 
   /* find expected number of stars */
-  if (!fits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
+  if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
     fprintf (stderr, "ERROR: can't get NSTARS from header\n");
-    fits_free_header (&header);
+    gfits_free_header (&header);
     return (FALSE);
   }
@@ -72 +72 @@
   /* read from FITS table or from text table */
   extend = FALSE;
-  fits_scan (&header, "EXTEND",  "%t", 1, &extend);
+  gfits_scan (&header, "EXTEND",  "%t", 1, &extend);
   if (extend) {
     fprintf (stderr, "reading from FITS cmp file %s\n", argv[2]);
-    Nbytes = fits_matrix_size (&header);
+    Nbytes = gfits_matrix_size (&header);
     fseek (f, Nbytes, SEEK_CUR); 
     stars = cmpReadFits (f, &Nstars);
@@ -81 +81 @@
     /* allocate space for stars */
     fprintf (stderr, "reading from TEXT cmp file %s\n", argv[2]);
-    if (!fits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
+    if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
       fprintf (stderr, "ERROR: failed to find NSTARS\n");
       exit (1);
@@ -138 +138 @@
   }      
   free (stars);
-  fits_free_header (&header);
+  gfits_free_header (&header);
   fprintf (stderr, "loaded %d objects\n", Nstars);
   return (TRUE);