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

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

@@ -249 +249 @@
 
   /* load in database header */
-  if (!fits_fread_header (f, &header)) {
+  if (!gfits_fread_header (f, &header)) {
     fclose (f);
-    fits_free_header (&header);
+    gfits_free_header (&header);
     fprintf (stderr, "ERROR: trouble reading database header\n");
     return ((RegImage *) NULL);
@@ -257 +257 @@
 
   /* check for database v1, v2 */
-  fits_scan (&header, "ORIGIN", "%s", 1, line);
+  gfits_scan (&header, "ORIGIN", "%s", 1, line);
   if (!strcmp (line, "MDM Observatory")) {
 
@@ -263 +263 @@
     
     /* load existing data from database */
-    fits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
+    gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
     ALLOCATE (image, RegImage, Nimage);
     status = fread (image, sizeof(RegImage), Nimage, f);
@@ -270 +270 @@
     if (status != Nimage) {
       fprintf (stderr, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
-      fits_free_header (&header);
+      gfits_free_header (&header);
       free (image);
       return ((RegImage *) NULL);
     }
-    fits_convert_RegImage (image, sizeof (RegImage), Nimage);
+    gfits_convert_RegImage (image, sizeof (RegImage), Nimage);
 
     *nimage = Nimage;
@@ -281 +281 @@
 
   /* we probably have v3 */
-  if (!fits_fread_matrix (f, &matrix, &header)) {
+  if (!gfits_fread_matrix (f, &matrix, &header)) {
     fclose (f);
-    fits_free_header (&header);
-    fits_free_matrix (&matrix);
+    gfits_free_header (&header);
+    gfits_free_matrix (&matrix);
     fprintf (stderr, "ERROR: trouble reading database matrix\n");
     return ((RegImage *) NULL);
@@ -290 +290 @@
 
   table.header = &theader;
-  if (!fits_fread_ftable  (f, &table, "IMAGE_DATABASE")) {
+  if (!gfits_fread_ftable  (f, &table, "IMAGE_DATABASE")) {
     fclose (f);
-    fits_free_header (&header);
-    fits_free_matrix (&matrix);
+    gfits_free_header (&header);
+    gfits_free_matrix (&matrix);
     fprintf (stderr, "ERROR: trouble reading database table\n");
     return ((RegImage *) NULL);
@@ -300 +300 @@
   /* convert to internal format */
   image = (RegImage *) table.buffer;
-  fits_scan (table.header, "NAXIS2", "%d", 1, &Nimage);
-  fits_convert_RegImage (image, sizeof (RegImage), Nimage);
-
-  fits_free_header (&header);
-  fits_free_matrix (&matrix);
+  gfits_scan (table.header, "NAXIS2", "%d", 1, &Nimage);
+  gfits_convert_RegImage (image, sizeof (RegImage), Nimage);
+
+  gfits_free_header (&header);
+  gfits_free_matrix (&matrix);
 
   *nimage = Nimage;