IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37656


Ignore:
Timestamp:
Nov 21, 2014, 8:21:16 AM (12 years ago)
Author:
eugene
Message:

adding gfits_find_header

Location:
branches/eam_branches/ipp-20140904/Ohana/src/libfits
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140904/Ohana/src/libfits/Makefile

    r34088 r37656  
    3232$(HEAD)/F_scan.$(ARCH).o                        $(HEAD)/F_print.$(ARCH).o     \
    3333$(HEAD)/F_copy_H.$(ARCH).o                      $(HEAD)/F_delete.$(ARCH).o    \
    34 $(HEAD)/F_read_XH.$(ARCH).o                     $(HEAD)/F_init_H.$(ARCH).o    \
    35 $(HEAD)/F_convert_H.$(ARCH).o                   $(HEAD)/version.$(ARCH).o
     34$(HEAD)/F_find_XH.$(ARCH).o                     $(HEAD)/F_init_H.$(ARCH).o    \
     35$(HEAD)/F_convert_H.$(ARCH).o                   $(HEAD)/F_read_XH.$(ARCH).o   \
     36$(HEAD)/version.$(ARCH).o
    3637
    3738MATRIX_OBJ = \

  • branches/eam_branches/ipp-20140904/Ohana/src/libfits/include/gfitsio.h

    r37427 r37656  
    119119int     gfits_modify_alt               PROTO((Header *header, char *field, char *mode, int N,...));
    120120int     gfits_print_alt                PROTO((Header *header, char *field, char *mode, int N,...));
     121int     gfits_find_Xheader             PROTO((char *filename, Header *header, char *extname));
    121122int     gfits_read_Xheader             PROTO((char *filename, Header *header, int N));
    122123int     gfits_read_header              PROTO((char *filename, Header *header));

  • branches/eam_branches/ipp-20140904/Ohana/src/libfits/table/F_read_T.c

    r29938 r37656  
    2525
    2626  header = table[0].header;
    27   fseeko (f, 0, SEEK_SET);
    28 
    29   found = FALSE;
    30   for (j = -1; !found; j++) {
    31     /* load data for this header */
    32     if (!gfits_load_header (f, header)) return (FALSE);
    33 
    34     /* check if this is the correct extension or not */
    35     bzero (tname, 80);
    36     gfits_scan (header, "EXTNAME", "%s", 1, tname);
    37     if (!strcmp (tname, extname)) {
    38       if (gfits_fread_ftable_data (f, table, FALSE)) return (TRUE);
    39       gfits_free_header (header);
    40       return (FALSE);
    41     }
    42 
    43     /* skip to next header */
    44     Nbytes = gfits_data_size (header);
    45     fseeko (f, Nbytes, SEEK_CUR);
    46     gfits_free_header (header);
    47   }
    48   return (TRUE);
    49 }       
     27  if (!gfits_find_Xheader (f, header, extname)) return FALSE;
     28
     29  if (gfits_fread_ftable_data (f, table, FALSE)) return (TRUE);
     30  gfits_free_header (header);
     31  return (FALSE);
     32}
    5033
    5134/*********************** fits read ftable data ***********************************/
Note: See TracChangeset for help on using the changeset viewer.