Changeset 37807 for trunk/Ohana/src/libfits

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/Makefile (modified) (1 diff)
• src/libfits/header/F_find_H.c (copied) (copied from branches/eam_branches/ipp-20140904/Ohana/src/libfits/header/F_find_H.c )
• src/libfits/header/F_free_H.c (modified) (1 diff)
• src/libfits/include/gfitsio.h (modified) (3 diffs)
• src/libfits/table/F_read_T.c (modified) (3 diffs)
• src/libfits/table/F_write_T.c (modified) (1 diff)

trunk/Ohana/src/libfits/Makefile

@@ -32 +32 @@
 $(HEAD)/F_scan.$(ARCH).o                        $(HEAD)/F_print.$(ARCH).o     \
 $(HEAD)/F_copy_H.$(ARCH).o                      $(HEAD)/F_delete.$(ARCH).o    \
-$(HEAD)/F_read_XH.$(ARCH).o                     $(HEAD)/F_init_H.$(ARCH).o    \
-$(HEAD)/F_convert_H.$(ARCH).o                   $(HEAD)/version.$(ARCH).o
+$(HEAD)/F_find_H.$(ARCH).o                      $(HEAD)/F_init_H.$(ARCH).o    \
+$(HEAD)/F_convert_H.$(ARCH).o                   $(HEAD)/F_read_XH.$(ARCH).o   \
+$(HEAD)/version.$(ARCH).o
 
 MATRIX_OBJ = \

trunk/Ohana/src/libfits/header/F_free_H.c

@@ -4 +4 @@
 /*********************** fits free header ***********************************/
 void gfits_free_header (Header *header) {
+
+  // fprintf (stderr, "free data for %zx\n", (size_t) header->buffer);
 
   if (header[0].buffer == (char *) NULL) return;

trunk/Ohana/src/libfits/include/gfitsio.h

@@ -17 +17 @@
 # define NEWLINE                 10  /* UNIX RETURN character */
 # endif /* NEWLINE */
+
+/* gfits_bintable_format returns 'byte' as the type associated with one-byte logical (non-char) values */
+typedef char byte;
 
 /********** FITS Constants *********/
@@ -116 +119 @@
 int     gfits_modify_alt               PROTO((Header *header, char *field, char *mode, int N,...)); 
 int     gfits_print_alt                PROTO((Header *header, char *field, char *mode, int N,...)); 
+int     gfits_find_Xheader             PROTO((FILE *f, Header *header, char *extname));
 int     gfits_read_Xheader             PROTO((char *filename, Header *header, int N));
 int     gfits_read_header              PROTO((char *filename, Header *header));
@@ -184 +188 @@
 int     gfits_fread_ftable             PROTO((FILE *f, FTable *ftable, char *extname)); 
 int     gfits_fread_ftable_data        PROTO((FILE *f, FTable *ftable, int padIfShort));
-int     gfits_fread_ftable_range       PROTO((FILE *f, FTable *ftable, off_t start, off_t Nrows));
+int     gfits_fread_ftable_range       PROTO((FILE *f, int padIfShort, FTable *ftable, off_t start, off_t Nrows));
 int     gfits_fread_vtable             PROTO((FILE *f, VTable *vtable, char *extname, off_t Nrow, off_t *row));
 int     gfits_fread_vtable_range       PROTO((FILE *f, VTable *vtable, off_t start, off_t Nrows));

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

@@ -19 +19 @@
 int gfits_fread_ftable (FILE *f, FTable *table, char *extname) {
 
-  int j, found;
-  off_t Nbytes;
   Header *header;
-  char tname[80];
 
   header = table[0].header;
-  fseeko (f, 0, SEEK_SET);
-
-  found = FALSE;
-  for (j = -1; !found; j++) {
-    /* load data for this header */
-    if (!gfits_load_header (f, header)) return (FALSE);
-
-    /* check if this is the correct extension or not */
-    bzero (tname, 80);
-    gfits_scan (header, "EXTNAME", "%s", 1, tname);
-    if (!strcmp (tname, extname)) {
-      if (gfits_fread_ftable_data (f, table, FALSE)) return (TRUE);
-      gfits_free_header (header);
-      return (FALSE);
-    }
-
-    /* skip to next header */
-    Nbytes = gfits_data_size (header);
-    fseeko (f, Nbytes, SEEK_CUR);
-    gfits_free_header (header);
-  }
-  return (TRUE);
-}       
+  if (!gfits_find_Xheader (f, header, extname)) return FALSE;
+
+  if (gfits_fread_ftable_data (f, table, FALSE)) return (TRUE);
+  gfits_free_header (header);
+  return (FALSE);
+}
 
 /*********************** fits read ftable data ***********************************/
@@ -84 +64 @@
 
 /*********************** fits read ftable data ***********************************/
-int gfits_fread_ftable_range (FILE *f, FTable *table, off_t start, off_t Nrows) {
+int gfits_fread_ftable_range (FILE *f, int padIfShort, FTable *table, off_t start, off_t Nrows) {
 
   off_t Nbytes, Nread, Nskip, Nx, Ny;
@@ -109 +89 @@
     if (ferror (f)) {
       perror ("fits read error");
+      free (table[0].buffer);
+      return (FALSE);
+    } 
+    fprintf (stderr, "error: fits read error in %s, read "OFF_T_FMT", need "OFF_T_FMT"\n", __func__,  Nread,  Nbytes);
+    if (padIfShort) {
+      memset (&table[0].buffer[Nread], 0, Nbytes - Nread);
+      fprintf (stderr, "warning: file missing data, padding with zeros: USE AT YOUR OWN RISK!\n");
+      table[0].validsize = Nread;
+      table[0].datasize = Nbytes;
     } else {
-      fprintf (stderr, "unexpected eof\n");
-    }      
-    free (table[0].buffer);
-    return (FALSE);
+      free (table[0].buffer);
+      return (FALSE);
+    }
   }
 

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

@@ -95 +95 @@
 
   // cursor must be at start of the table (after table header)
-  fseeko (f, Nskip, SEEK_CUR);
+  if (fseeko (f, Nskip, SEEK_CUR)) {
+    fprintf (stderr, "can't seek table start\n");
+    return (FALSE);
+  }
+
   Nwrite = fwrite (ftable[0].buffer, sizeof (char), Nbytes, f);
   if (Nwrite != Nbytes) {