fitsfile.h   fitsfile.h 
/*** File fitsfile.h FITS and IRAF file access subroutines /*** File fitsfile.h FITS and IRAF file access subroutines
*** January 11, 2007 *** June 11, 2007
*** By Doug Mink, dmink@cfa.harvard.edu *** By Doug Mink, dmink@cfa.harvard.edu
*** Harvard-Smithsonian Center for Astrophysics *** Harvard-Smithsonian Center for Astrophysics
*** Copyright (C) 1996-2007 *** Copyright (C) 1996-2007
*** Smithsonian Astrophysical Observatory, Cambridge, MA, USA *** Smithsonian Astrophysical Observatory, Cambridge, MA, USA
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version. version 2 of the License, or (at your option) any later version.
skipping to change at line 243 skipping to change at line 243
double bscale, /* Scale factor for pixel scaling */ double bscale, /* Scale factor for pixel scaling */
int x, /* One-based horizontal pixel number */ int x, /* One-based horizontal pixel number */
int y); /* One-based vertical pixel number */ int y); /* One-based vertical pixel number */
double maxvec( /* Get maximum value in vector from a image */ double maxvec( /* Get maximum value in vector from a image */
char *image, /* Image array from which to extract vector */ char *image, /* Image array from which to extract vector */
int bitpix, /* Number of bits per pixel in image */ int bitpix, /* Number of bits per pixel in image */
double bzero, /* Zero point for pixel scaling */ double bzero, /* Zero point for pixel scaling */
double bscale, /* Scale factor for pixel scaling */ double bscale, /* Scale factor for pixel scaling */
int pix1, /* Offset of first pixel to extract */ int pix1, /* Offset of first pixel to extract */
int npix); /* Number of pixels to extract */ int npix); /* Number of pixels to extract */
double minvec( /* Get minimum value in vector from a image */
char *image, /* Image array from which to extract vector */
int bitpix, /* Number of bits per pixel in image */
double bzero, /* Zero point for pixel scaling */
double bscale, /* Scale factor for pixel scaling */
int pix1, /* Offset of first pixel to extract */
int npix); /* Number of pixels to extract */
void putpix( /* Write one pixel to any data type 2-D array (0,0)* / void putpix( /* Write one pixel to any data type 2-D array (0,0)* /
char *image, /* Image array as 1-D vector */ char *image, /* Image array as 1-D vector */
int bitpix, /* FITS bits per pixel */ int bitpix, /* FITS bits per pixel */
int w, /* Image width in pixels */ int w, /* Image width in pixels */
int h, /* Image height in pixels */ int h, /* Image height in pixels */
double bzero, /* Zero point for pixel scaling */ double bzero, /* Zero point for pixel scaling */
double bscale, /* Scale factor for pixel scaling */ double bscale, /* Scale factor for pixel scaling */
int x, /* Zero-based horizontal pixel number */ int x, /* Zero-based horizontal pixel number */
int y, /* Zero-based vertical pixel number */ int y, /* Zero-based vertical pixel number */
double dpix); /* Value to put into image pixel */ double dpix); /* Value to put into image pixel */
skipping to change at line 968 skipping to change at line 975
extern int irafwhead(); extern int irafwhead();
extern int irafwimage(); extern int irafwimage();
extern int isiraf(); extern int isiraf();
extern char *iraf2fits(); extern char *iraf2fits();
extern char *fits2iraf(); extern char *fits2iraf();
/* Image pixel access subroutines in imio.c */ /* Image pixel access subroutines in imio.c */
extern double getpix(); /* Read one pixel from any data type 2-D arr ay (0,0)*/ extern double getpix(); /* Read one pixel from any data type 2-D arr ay (0,0)*/
extern double getpix1(); /* Read one pixel from any data type 2-D array (1, 1)*/ extern double getpix1(); /* Read one pixel from any data type 2-D array (1, 1)*/
extern double maxvec(); /* Get maximum value in vector from a image */ extern double maxvec(); /* Get maximum value in vector from a image */
extern double minvec(); /* Get minimum value in vector from a image */
extern void putpix(); /* Write one pixel to any data type 2-D array (0,0)* / extern void putpix(); /* Write one pixel to any data type 2-D array (0,0)* /
extern void putpix1(); /* Write one pixel to any data type 2-D array (1,1) */ extern void putpix1(); /* Write one pixel to any data type 2-D array (1,1) */
extern void addpix(); /* Add to one pixel in any data type 2-D array (0,0) */ extern void addpix(); /* Add to one pixel in any data type 2-D array (0,0) */
extern void addpix1(); /* Add to one pixel in any data type 2-D array (1,1) */ extern void addpix1(); /* Add to one pixel in any data type 2-D array (1,1) */
extern void movepix(); /* Move one pixel value between two 2-D arrays (0,0) */ extern void movepix(); /* Move one pixel value between two 2-D arrays (0,0) */
extern void movepix1(); /* Move one pixel value between two 2-D arra ys (1,1) */ extern void movepix1(); /* Move one pixel value between two 2-D arra ys (1,1) */
extern void addvec(); /* Add constant to vector from 2-D array */ extern void addvec(); /* Add constant to vector from 2-D array */
extern void multvec(); /* Multiply vector from 2-D array by a constant */ extern void multvec(); /* Multiply vector from 2-D array by a constant */
extern void getvec(); /* Read vector from 2-D array */ extern void getvec(); /* Read vector from 2-D array */
extern void putvec(); /* Write vector into 2-D array */ extern void putvec(); /* Write vector into 2-D array */
skipping to change at line 1241 skipping to change at line 1249
* *
* Oct 14 2005 Add tsd2fd(), tsd2dt(), epj2ep(), epb2ep(), tsi2dt() * Oct 14 2005 Add tsd2fd(), tsd2dt(), epj2ep(), epb2ep(), tsi2dt()
* *
* Feb 23 2006 Add fitsrtail() to read appended FITS header * Feb 23 2006 Add fitsrtail() to read appended FITS header
* Feb 23 2006 Add istiff(), isjpeg(), isgif() to check TIFF, JPEG, GIF fil es * Feb 23 2006 Add istiff(), isjpeg(), isgif() to check TIFF, JPEG, GIF fil es
* Sep 6 2006 Add heliocentric time conversions * Sep 6 2006 Add heliocentric time conversions
* Oct 5 2006 Add local sidereal time conversions * Oct 5 2006 Add local sidereal time conversions
* *
* Jan 9 2007 Add ANSI prototypes * Jan 9 2007 Add ANSI prototypes
* Jan 11 2007 Add token subroutines from catutil.c/wcscat.h to fileutil.c * Jan 11 2007 Add token subroutines from catutil.c/wcscat.h to fileutil.c
* Jun 11 2007 Add minvec() subroutine in imio.c
*/ */
 End of changes. 4 change blocks. 
1 lines changed or deleted 10 lines changed or added


 wcs.h   wcs.h 
/*** File libwcs/wcs.h /*** File libwcs/wcs.h
*** February 1, 2007 *** July 25, 2007
*** By Doug Mink, dmink@cfa.harvard.edu *** By Doug Mink, dmink@cfa.harvard.edu
*** Harvard-Smithsonian Center for Astrophysics *** Harvard-Smithsonian Center for Astrophysics
*** Copyright (C) 1994-2007 *** Copyright (C) 1994-2007
*** Smithsonian Astrophysical Observatory, Cambridge, MA, USA *** Smithsonian Astrophysical Observatory, Cambridge, MA, USA
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version. version 2 of the License, or (at your option) any later version.
skipping to change at line 574 skipping to change at line 574
double epoch); /* Besselian epoch in years */ double epoch); /* Besselian epoch in years */
int wcscsys( /* Return code for coordinate system in string */ int wcscsys( /* Return code for coordinate system in string */
char *coorsys); /* Coordinate system (B1950, J2000, etc) */ char *coorsys); /* Coordinate system (B1950, J2000, etc) */
double wcsceq ( /* Set equinox from string (return 0.0 if not obviou s) */ double wcsceq ( /* Set equinox from string (return 0.0 if not obviou s) */
char *wcstring); /* Coordinate system (B1950, J2000, etc) */ char *wcstring); /* Coordinate system (B1950, J2000, etc) */
void wcscstr ( /* Set coordinate system type string from system and equinox */ void wcscstr ( /* Set coordinate system type string from system and equinox */
char *cstr, /* Coordinate system string (returned) */ char *cstr, /* Coordinate system string (returned) */
int syswcs, /* Coordinate system code */ int syswcs, /* Coordinate system code */
double equinox, /* Equinox of coordinate system */ double equinox, /* Equinox of coordinate system */
double epoch); /* Epoch of coordinate system */ double epoch); /* Epoch of coordinate system */
void d2v3 ( /* Convert RA and Dec in degrees and distanc
e to vector */
double rra, /* Right ascension in degrees */
double rdec, /* Declination in degrees */
double r, /* Distance to object in same units as pos */
double pos[3]); /* x,y,z geocentric equatorial position of object (r
eturned) */
void s2v3 ( /* Convert RA and Dec in radians and distanc
e to vector */
double rra, /* Right ascension in radians */
double rdec, /* Declination in radians */
double r, /* Distance to object in same units as pos */
double pos[3]); /* x,y,z geocentric equatorial position of object (r
eturned) */
void v2d3 ( /* Convert vector to RA and Dec in degrees a
nd distance */
double pos[3], /* x,y,z geocentric equatorial position of object */
double *rra, /* Right ascension in degrees (returned) */
double *rdec, /* Declination in degrees (returned) */
double *r); /* Distance to object in same units as pos (returned
) */
void v2s3 ( /* Convert vector to RA and Dec in radians a
nd distance */
double pos[3], /* x,y,z geocentric equatorial position of object */
double *rra, /* Right ascension in radians (returned) */
double *rdec, /* Declination in radians (returned) */
double *r); /* Distance to object in same units as pos (returned
) */
/* Distortion model subroutines in distort.c */ /* Distortion model subroutines in distort.c */
void distortinit ( /* Set distortion coefficients from FITS header */ void distortinit ( /* Set distortion coefficients from FITS header */
struct WorldCoor *wcs, /* World coordinate system structure */ struct WorldCoor *wcs, /* World coordinate system structure */
const char* hstring); /* FITS header */ const char* hstring); /* FITS header */
void setdistcode ( /* Set WCS distortion code string from CTYPEi value */ void setdistcode ( /* Set WCS distortion code string from CTYPEi value */
struct WorldCoor *wcs, /* World coordinate system structure */ struct WorldCoor *wcs, /* World coordinate system structure */
char *ctype); /* CTYPE value from FITS header */ char *ctype); /* CTYPE value from FITS header */
char *getdistcode ( /* Return distortion code string for CTYPEi */ char *getdistcode ( /* Return distortion code string for CTYPEi */
struct WorldCoor *wcs); /* World coordinate system structure */ struct WorldCoor *wcs); /* World coordinate system structure */
skipping to change at line 739 skipping to change at line 759
int cpwcs(); /* Copy WCS keywords with no suffix to ones with suf fix */ int cpwcs(); /* Copy WCS keywords with no suffix to ones with suf fix */
/* Coordinate conversion subroutines in wcscon.c */ /* Coordinate conversion subroutines in wcscon.c */
void wcscon(); /* Convert between coordinate systems and equinoxes */ void wcscon(); /* Convert between coordinate systems and equinoxes */
void wcsconp(); /* Convert between coordinate systems and eq uinoxes */ void wcsconp(); /* Convert between coordinate systems and eq uinoxes */
void wcsconv(); /* Convert between coordinate systems and eq uinoxes */ void wcsconv(); /* Convert between coordinate systems and eq uinoxes */
void fk425e(); /* Convert B1950(FK4) to J2000(FK5) coordinates */ void fk425e(); /* Convert B1950(FK4) to J2000(FK5) coordinates */
void fk524e(); /* Convert J2000(FK5) to B1950(FK4) coordinates */ void fk524e(); /* Convert J2000(FK5) to B1950(FK4) coordinates */
int wcscsys(); /* Set coordinate system from string */ int wcscsys(); /* Set coordinate system from string */
double wcsceq(); /* Set equinox from string (return 0.0 if not obviou s) */ double wcsceq(); /* Set equinox from string (return 0.0 if not obviou s) */
void d2v3(); /* Convert RA and Dec in degrees and distance to vec
tor */
void s2v3(); /* Convert RA and Dec in radians and distance to vec
tor */
void v2d3(); /* Convert vector to RA and Dec in degrees and dista
nce */
void v2s3(); /* Convert vector to RA and Dec in radians and dista
nce */
/* Distortion model subroutines in distort.c */ /* Distortion model subroutines in distort.c */
void distortinit(); /* Set distortion coefficients from FITS header */ void distortinit(); /* Set distortion coefficients from FITS header */
void setdistcode(); /* Set WCS distortion code string from CTYPEi value */ void setdistcode(); /* Set WCS distortion code string from CTYPEi value */
char *getdistcode(); /* Return distortion code string for CTYPEi */ char *getdistcode(); /* Return distortion code string for CTYPEi */
int DelDistort(); /* Delete all distortion-related fields */ int DelDistort(); /* Delete all distortion-related fields */
void pix2foc(); /* pixel coordinates -> focal plane coordin ates */ void pix2foc(); /* pixel coordinates -> focal plane coordin ates */
void foc2pix(); /* focal plane coordinates -> pixel coordin ates */ void foc2pix(); /* focal plane coordinates -> pixel coordin ates */
/* Other projection subroutines */ /* Other projection subroutines */
skipping to change at line 891 skipping to change at line 915
* Apr 24 2006 Increase maximum number of axes to 9 * Apr 24 2006 Increase maximum number of axes to 9
* Nov 29 2006 Drop semicolon at end of C++ ifdef * Nov 29 2006 Drop semicolon at end of C++ ifdef
* Dec 21 2006 Add cpwcs() * Dec 21 2006 Add cpwcs()
* *
* Jan 4 2007 Drop extra declaration of wcscstr() * Jan 4 2007 Drop extra declaration of wcscstr()
* Jan 4 2007 Fix declarations so ANSI prototypes are not just for C++ * Jan 4 2007 Fix declarations so ANSI prototypes are not just for C++
* Jan 9 2007 Add fk425e() and fk524e() subroutines * Jan 9 2007 Add fk425e() and fk524e() subroutines
* Jan 9 2007 Add worldpos.c, dsspos.c, platepos.c, and tnxpos.c subroutin es * Jan 9 2007 Add worldpos.c, dsspos.c, platepos.c, and tnxpos.c subroutin es
* Jan 10 2007 Add ANSI prototypes for all subroutines * Jan 10 2007 Add ANSI prototypes for all subroutines
* Feb 1 2007 Add wcs.wcslog for log wavelength * Feb 1 2007 Add wcs.wcslog for log wavelength
* Jul 25 2007 Add v2s3(), s2v3(), d2v3(), v2d3() for coordinate-vector con version
*/ */
 End of changes. 4 change blocks. 
1 lines changed or deleted 38 lines changed or added


 wcscat.h   wcscat.h 
/*** File libwcs/wcscat.h /*** File libwcs/wcscat.h
*** March 13, 2007 *** July 18, 2007
*** By Doug Mink, dmink@cfa.harvard.edu *** By Doug Mink, dmink@cfa.harvard.edu
*** Copyright (C) 1998-2007 *** Copyright (C) 1998-2007
*** Smithsonian Astrophysical Observatory, Cambridge, MA, USA *** Smithsonian Astrophysical Observatory, Cambridge, MA, USA
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version. version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful, This library is distributed in the hope that it will be useful,
skipping to change at line 66 skipping to change at line 66
/* Catalog proper motion units */ /* Catalog proper motion units */
#define PM_MASYR 1 /* milliarcseconds per year */ #define PM_MASYR 1 /* milliarcseconds per year */
#define PM_ARCSECYR 2 /* arcseconds per year */ #define PM_ARCSECYR 2 /* arcseconds per year */
#define PM_DEGYR 3 /* degrees per year */ #define PM_DEGYR 3 /* degrees per year */
#define PM_RADYR 4 /* radians per year */ #define PM_RADYR 4 /* radians per year */
#define PM_TSECYR 5 /* seconds of time (RA) per century */ #define PM_TSECYR 5 /* seconds of time (RA) per century */
#define PM_ARCSECCEN 6 /* arcseconds per year */ #define PM_ARCSECCEN 6 /* arcseconds per year */
#define PM_TSECCEN 7 /* seconds of time (RA) per century */ #define PM_TSECCEN 7 /* seconds of time (RA) per century */
#define PM_MTSYR 8 /* milliseconds of time (RA) per yea r */ #define PM_MTSYR 8 /* milliseconds of time (RA) per yea r */
#define PM_ARCSECHR 9 /* arcseconds per hour (solar system ) */
/* Data structure for SAO TDC ASCII and binary star catalogs */ /* Data structure for SAO TDC ASCII and binary star catalogs */
struct StarCat { struct StarCat {
int star0; /* Subtract from star number for file sequence numbe r */ int star0; /* Subtract from star number for file sequence numbe r */
int star1; /* First star number in file */ int star1; /* First star number in file */
int nstars; /* Number of stars in file */ int nstars; /* Number of stars in file */
int stnum; /* Star number format in catalog file: int stnum; /* Star number format in catalog file:
<0: -stnum-character name at end instead of number <0: -stnum-character name at end instead of number
0: no star i.d. numbers 0: no star i.d. numbers
1: Real*4 star i.d. numbers 1: Real*4 star i.d. numbers
skipping to change at line 199 skipping to change at line 200
#define UB1 21 /* USNO B-1.0 Star Catalog */ #define UB1 21 /* USNO B-1.0 Star Catalog */
#define UCAC1 22 /* USNO CCD Astrograph Catalog 1.0 */ #define UCAC1 22 /* USNO CCD Astrograph Catalog 1.0 */
#define UCAC2 23 /* USNO CCD Astrograph Catalog 2.0 */ #define UCAC2 23 /* USNO CCD Astrograph Catalog 2.0 */
#define TMIDR2 24 /* 2MASS IDR2 Point Source Catalog */ #define TMIDR2 24 /* 2MASS IDR2 Point Source Catalog */
#define YB6 25 /* USNO YB6 Catalog */ #define YB6 25 /* USNO YB6 Catalog */
#define SDSS 26 /* Sloan Digital Sky Survey Catalog */ #define SDSS 26 /* Sloan Digital Sky Survey Catalog */
#define TMXSC 27 /* 2MASS Extended Source Catalog */ #define TMXSC 27 /* 2MASS Extended Source Catalog */
#define TMPSCE 28 /* 2MASS Point Source Catalog with mag error s */ #define TMPSCE 28 /* 2MASS Point Source Catalog with mag error s */
#define TYCHO2E 29 /* Tycho-2 Star Catalog with magnitu de errors */ #define TYCHO2E 29 /* Tycho-2 Star Catalog with magnitu de errors */
#define SKY2K 30 /* SKY2000 Master Catalog */ #define SKY2K 30 /* SKY2000 Master Catalog */
#define SKYBOT 31 /* SKYBOT Solar System Objects */
#define TABCAT -1 /* StarBase tab table catalog */ #define TABCAT -1 /* StarBase tab table catalog */
#define BINCAT -2 /* TDC binary catalog */ #define BINCAT -2 /* TDC binary catalog */
#define TXTCAT -3 /* TDC ASCII catalog */ #define TXTCAT -3 /* TDC ASCII catalog */
#define WEBCAT -4 /* Tab catalog via the web */ #define WEBCAT -4 /* Tab catalog via the web */
#define NUMCAT 30 /* Number of predefined catalogs */ #define NUMCAT 31 /* Number of predefined catalogs */
#define EP_EP 1 /* Output epoch as fractional year */ #define EP_EP 1 /* Output epoch as fractional year */
#define EP_JD 2 /* Output epoch as Julian Date */ #define EP_JD 2 /* Output epoch as Julian Date */
#define EP_MJD 3 /* Ouput epoch as Modified Julian Date */ #define EP_MJD 3 /* Ouput epoch as Modified Julian Date */
#define EP_FD 4 /* Output epoch in FITS format (yyyy-mm-dd) */ #define EP_FD 4 /* Output epoch in FITS format (yyyy-mm-dd) */
#define EP_ISO 5 /* Output epoch in ISO format (yyyy-mm-ddThh:mm:ss) */ #define EP_ISO 5 /* Output epoch in ISO format (yyyy-mm-ddThh:mm:ss) */
/* Structure for dealing with ranges */ /* Structure for dealing with ranges */
#define MAXRANGE 20 #define MAXRANGE 20
struct Range { struct Range {
skipping to change at line 790 skipping to change at line 792
struct WorldCoor *wcs, /* World coordinate system for image */ struct WorldCoor *wcs, /* World coordinate system for image */
char *header, /* FITS header for output image */ char *header, /* FITS header for output image */
char *image, /* Output FITS image */ char *image, /* Output FITS image */
double mag1, /* Minimum (brightest) magnitude (no limits if equal ) */ double mag1, /* Minimum (brightest) magnitude (no limits if equal ) */
double mag2, /* Maximum (faintest) magnitude (no limits if equal) */ double mag2, /* Maximum (faintest) magnitude (no limits if equal) */
int sortmag, /* Magnitude to use (1 to nmag) */ int sortmag, /* Magnitude to use (1 to nmag) */
double magscale, /* Scaling factor for magnitude to pixel flux double magscale, /* Scaling factor for magnitude to pixel flux
* (image of number of catalog objects per bin if 0) */ * (image of number of catalog objects per bin if 0) */
int nlog); /* Verbose mode if > 1, number of sources per log li ne */ int nlog); /* Verbose mode if > 1, number of sources per log li ne */
int skybotread ( /* Find solar system objects from SkyBot */
double cra, /* Search center J2000 right ascension in degrees */
double cdec, /* Search center J2000 declination in degrees */
double dra, /* Search half width in right ascension in degrees *
/
double ddec, /* Search half-width in declination in degrees */
double drad, /* Limiting separation in degrees (ignore if 0) */
int distsort, /* 1 to sort asteroids by distance from center */
int sysout, /* Search coordinate system */
double eqout, /* Search coordinate equinox */
double epout, /* Julian date for positions (current time if zero)
*/
double mag1, /* Lower limiting magnitude (none if equal to mag2)
*/
double mag2, /* Upper limiting magnitude (none if equal to mag1)
*/
int sortmag, /* Magnitude by which to sort (1 to nmag) */
int nstarmax, /* Maximum number of stars to be returned */
double *gnum, /* Array of asteroid numbers (returned) */
char **gobj, /* Array of object IDs (too long for integer*4) */
double *gra, /* Array of right ascensions (returned) */
double *gdec, /* Array of declinations (returned) */
double *gpra, /* Array of right ascension motions (returned) */
double *gpdec, /* Array of declination motions (returned) */
double **gmag, /* 2-D array of magnitudes and other info (returned)
*/
int *gtype, /* Array of object classes (returned) */
int nlog); /* 1 for diagnostics */
char *skybot2tab( /* Convert SkyBot buffer from space- to tab-separate
d */
char *csvbuff); /* Input comma-separated table */
/* Subroutines to read SAO-TDC binary format catalogs */ /* Subroutines to read SAO-TDC binary format catalogs */
int binread( /* Read from sky region from SAO TDC binary format c atalog */ int binread( /* Read from sky region from SAO TDC binary format c atalog */
char *bincat, /* Name of reference star catalog file */ char *bincat, /* Name of reference star catalog file */
int distsort, /* 1 to sort stars by distance from center */ int distsort, /* 1 to sort stars by distance from center */
double cra, /* Search center J2000 right ascension in degrees */ double cra, /* Search center J2000 right ascension in degrees */
double cdec, /* Search center J2000 declination in degrees */ double cdec, /* Search center J2000 declination in degrees */
double dra, /* Search half width in right ascension in degrees * / double dra, /* Search half width in right ascension in degrees * /
double ddec, /* Search half-width in declination in degrees */ double ddec, /* Search half-width in declination in degrees */
double drad, /* Limiting separation in degrees (ignore if 0) */ double drad, /* Limiting separation in degrees (ignore if 0) */
double dradi, /* Inner edge of annulus in degrees (ignore if 0) */ double dradi, /* Inner edge of annulus in degrees (ignore if 0) */
skipping to change at line 971 skipping to change at line 1000
char *keyword, /* column header of desired value */ char *keyword, /* column header of desired value */
char *string, /* character string (returned) */ char *string, /* character string (returned) */
int maxchar); /* Maximum number of characters in returned string * / int maxchar); /* Maximum number of characters in returned string * /
int tabgetc( /* Get tab table entry for named column */ int tabgetc( /* Get tab table entry for named column */
struct Tokens *tabtok, /* Line token structure */ struct Tokens *tabtok, /* Line token structure */
int ientry, /* sequence of entry on line */ int ientry, /* sequence of entry on line */
char *string, /* character string (returned) */ char *string, /* character string (returned) */
int maxchar); /* Maximum number of characters in returned string * / int maxchar); /* Maximum number of characters in returned string * /
int tabparse( /* Aeturn column names and positions in tabt able */ int tabparse( /* Aeturn column names and positions in tabt able */
struct TabTable *tabtable); /* Tab table data structure */ struct TabTable *tabtable); /* Tab table data structure */
int tabcol( /* Find column for name */ int tabcol( /* Find column for name (case-sensitive) */
struct TabTable *tabtable, /* Tab table data structure */
char *keyword); /* column header of desired value */
int tabccol( /* Find column for name (case-insensitive) */
struct TabTable *tabtable, /* Tab table data structure */ struct TabTable *tabtable, /* Tab table data structure */
char *keyword); /* column header of desired value */ char *keyword); /* column header of desired value */
int istab( /* Return 1 if tab table file, else 0 */ int istab( /* Return 1 if tab table file, else 0 */
char *filename); /* Name of file to check */ char *filename); /* Name of file to check */
char *gettaberr(); /* Return most recent tab table error message */ char *gettaberr(); /* Return most recent tab table error message */
int gettabndec(); /* Return number of decimal places in tab catalog id s */ int gettabndec(); /* Return number of decimal places in tab catalog id s */
/* Subroutines to read catalogs over the web, from SCAT, HST, ESO, or SDSS servers */ /* Subroutines to read catalogs over the web, from SCAT, HST, ESO, or SDSS servers */
int webread( /* Read sources by sky region from WWW catalog */ int webread( /* Read sources by sky region from WWW catalog */
char *caturl, /* URL of search engine */ char *caturl, /* URL of search engine */
skipping to change at line 1387 skipping to change at line 1419
/* Subroutines to read a local copy of the Tycho-2 catalog (ty2read.c) */ /* Subroutines to read a local copy of the Tycho-2 catalog (ty2read.c) */
int ty2read(); /* Read sources by sky region from Tycho 2 Catalog * / int ty2read(); /* Read sources by sky region from Tycho 2 Catalog * /
int ty2rnum(); /* Read sources by ID number from Tycho 2 Catalog */ int ty2rnum(); /* Read sources by ID number from Tycho 2 Catalog */
int ty2bin(); /* Bin sources from Tycho 2 Catalog */ int ty2bin(); /* Bin sources from Tycho 2 Catalog */
/* Subroutines to read a local copy of the ACT catalog (actread.c) */ /* Subroutines to read a local copy of the ACT catalog (actread.c) */
int actread(); /* Read sources by sky region from USNO ACT Catalog */ int actread(); /* Read sources by sky region from USNO ACT Catalog */
int actrnum(); /* Read sources by ID number from USNO ACT Catalog * / int actrnum(); /* Read sources by ID number from USNO ACT Catalog * /
int actbin(); /* Bin sources from USNO ACT Catalog */ int actbin(); /* Bin sources from USNO ACT Catalog */
/* Subroutines to retrieve solar system objects over the web from SkyBot */
int skybotread(); /* Find solar system objects from SkyBot */
char *skybot2tab(); /* Convert SkyBot returned data to Starbase table */
void setobs(); /* Set observatory using IAU code */
void setobsname(); /* Set IAU code from observatory name */
/* Subroutines to read SAO-TDC binary format catalogs (binread.c) */ /* Subroutines to read SAO-TDC binary format catalogs (binread.c) */
int binread(); /* Read sources by sky region from SAO TDC binary fo rmat catalog */ int binread(); /* Read sources by sky region from SAO TDC binary fo rmat catalog */
int binrnum(); /* Read sources by ID number from SAO TDC binary for mat catalog */ int binrnum(); /* Read sources by ID number from SAO TDC binary for mat catalog */
int binbin(); /* Bin sources from SAO TDC binary format catalog */ int binbin(); /* Bin sources from SAO TDC binary format catalog */
int binstar(); /* Read one star entry from binary catalog, 0 if OK */ int binstar(); /* Read one star entry from binary catalog, 0 if OK */
int isbin(); int isbin();
struct StarCat *binopen(); struct StarCat *binopen();
void binclose(); void binclose();
/* Subroutines for extracting tab table information (tabread.c) */ /* Subroutines for extracting tab table information (tabread.c) */
int tabread(); /* Read sources from tab table catalog */ int tabread(); /* Read sources from tab table catalog */
int tabrnum(); /* Read sources from tab table catalog */ int tabrnum(); /* Read sources from tab table catalog */
int tabbin(); /* Read sources from tab table catalog */ int tabbin(); /* Read sources from tab table catalog */
struct TabTable *tabopen(); /* Open tab table file */ struct TabTable *tabopen(); /* Open tab table file */
struct StarCat *tabcatopen(); /* Open tab table catalog */ struct StarCat *tabcatopen(); /* Open tab table catalog */
void tabcatclose(); /* Close tab table catalog */ void tabcatclose(); /* Close tab table catalog */
int tabxyread(); /* Read x, y, and magnitude from tab table star list */ int tabxyread(); /* Read x, y, and magnitude from tab table star list */
void settabkey(); /* Set tab table keyword to read for object */ void settabkey(); /* Set tab table keyword to read for object */
char *gettabline(); /* Find a specified line in a tab table */ char *gettabline(); /* Find a specified line in a tab table */
int tabrkey(); /* Keyword values from tab table catalogs */ int tabrkey(); /* Keyword values from tab table catalogs */
int tabcol(); /* Find column for name */ int tabcol(); /* Find column for name (case-sensitive) */
int tabccol(); /* Find column for name (case-insensitive) */
int tabgetk(); /* Get tab table entries for named column */ int tabgetk(); /* Get tab table entries for named column */
int tabgetc(); /* Get tab table entry for named column */ int tabgetc(); /* Get tab table entry for named column */
int tabgeti4(); /* Return 4-byte integer from tab table line */ int tabgeti4(); /* Return 4-byte integer from tab table line */
int tabparse(); /* Aeturn column names and positions in tabt able */ int tabparse(); /* Aeturn column names and positions in tabt able */
double tabgetra(); /* Return right ascension in degrees from tab table* / double tabgetra(); /* Return right ascension in degrees from tab table* /
double tabgetdec(); /* Return declination in degrees from tab table*/ double tabgetdec(); /* Return declination in degrees from tab table*/
double tabgetr8(); /* Return double number from tab table line */ double tabgetr8(); /* Return double number from tab table line */
void tabclose(); /* Free all arrays left open by tab table structure */ void tabclose(); /* Free all arrays left open by tab table structure */
char *gettaberr(); /* Return most recent tab table error message */ char *gettaberr(); /* Return most recent tab table error message */
int istab(); /* Return 1 if tab table file, else 0 */ int istab(); /* Return 1 if tab table file, else 0 */
skipping to change at line 1623 skipping to change at line 1662
* Mar 17 2006 Make vothead() int as it now returns the number of fields * Mar 17 2006 Make vothead() int as it now returns the number of fields
* Apr 3 2006 Add tmcid() to check for 2MASS identifiers * Apr 3 2006 Add tmcid() to check for 2MASS identifiers
* Apr 3 2006 Add setdateform() to set output date format * Apr 3 2006 Add setdateform() to set output date format
* Apr 12 2006 Add SORT_ID for scat to sort catalog entries by ID number * Apr 12 2006 Add SORT_ID for scat to sort catalog entries by ID number
* Jun 20 2006 Add IDSortStars() * Jun 20 2006 Add IDSortStars()
* *
* Jan 10 2006 Add ANSI C function prototypes * Jan 10 2006 Add ANSI C function prototypes
* Jan 11 2007 Move token access subroutines to fileutil.c/fitsfile.h * Jan 11 2007 Move token access subroutines to fileutil.c/fitsfile.h
* Mar 13 2007 Add gsc2c2t() to convert CSV GSC2 buffer to TSV table * Mar 13 2007 Add gsc2c2t() to convert CSV GSC2 buffer to TSV table
* Mar 13 2007 Add gobj object name to gsc2read() * Mar 13 2007 Add gobj object name to gsc2read()
* Jul 5 2007 Add SKYBOT=31 to catalog list
* Jul 13 2007 Add skybotread() and skybot2tab()
* Jul 18 2007 Add tabccol() and PM_ARCSECHR for SkyBot
*/ */
 End of changes. 9 change blocks. 
4 lines changed or deleted 52 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/