Index: /branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_image.c =================================================================== --- /branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_image.c (revision 37379) +++ /branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_image.c (revision 37380) @@ -281,4 +281,6 @@ } +# define TABLE_WIDTH 4 + int gfits_table_mkheader_Image (Header *header) { @@ -288,64 +290,6 @@ /* define table layout */ /** TABLE DEFINITION **/ - gfits_define_bintable_column (header, "D", "CRVAL1", "coordinate at reference pixel", "", 1.0, 0.0); - gfits_define_bintable_column (header, "D", "CRVAL2", "coordinate at reference pixel", "", 1.0, 0.0); -# if (0) - gfits_define_bintable_column (header, "E", "CRPIX1", "coordinate of reference pixel", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "CRPIX2", "coordinate of reference pixel", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "CDELT1", "degrees per pixel", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "CDELT2", "degrees per pixel", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "PC1_1", "rotation matrix", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "PC1_2", "rotation matrix", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "PC2_1", "rotation matrix", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "PC2_2", "rotation matrix", "", 1.0, 0.0); - gfits_define_bintable_column (header, "14E", "POLYTERMS", "higher order warping terms", "", 1.0, 0.0); - gfits_define_bintable_column (header, "15A", "CTYPE", "coordinate type", "", 1.0, 0.0); - gfits_define_bintable_column (header, "A", "NPOLYTERMS", "order of polynomial", "", 1.0, 0.0); - gfits_define_bintable_column (header, "8B", "MOSAIC", "pointer to parent mosaic", "", 1.0, 0.0); - gfits_define_bintable_column (header, "8B", "IMAGE_MAP", "pointer to image map", "", 1.0, 0.0); - gfits_define_bintable_column (header, "J", "TZERO", "readout time (row 0)", "", 1.0, 0.0); - gfits_define_bintable_column (header, "J", "NSTAR", "number of stars on image", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "SECZ", "airmass", "mag", 1.0, 0.0); gfits_define_bintable_column (header, "I", "NX", "image width", "", 1.0, 0.0); gfits_define_bintable_column (header, "I", "NY", "image height", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "APMIFIT", "aperture correction", "mag", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "DAPMIFIT", "apmifit error", "mag", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "MCAL", "calibration mag", "mag", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "DMCAL", "error on Mcal", "mag", 1.0, 0.0); - gfits_define_bintable_column (header, "I", "XM", "image chisq", "10*log(value)", 1.0, 0.0); - gfits_define_bintable_column (header, "I", "PHOTCODE", "identifier for CCD,", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "EXPTIME", "exposure time", "seconds", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "ST", "sidereal time of exposure", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "LAT", "observatory latitude", "degrees", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "RA_CENTER", "image center", "degrees", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "DEC_CENTER", "image center", "degrees", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "RADIUS", "image radius", "degrees", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "REF_COLOR_BLUE", "median astrometry ref color", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "REF_COLOR_RED", "median astrometry ref color", "", 1.0, 0.0); - gfits_define_bintable_column (header, "117A", "NAME", "name of original image ", "", 1.0, 0.0); - gfits_define_bintable_column (header, "B", "DETECTION_LIMIT", "detection limit", "10*mag", 1.0, 0.0); - gfits_define_bintable_column (header, "B", "SATURATION_LIMIT", "saturation limit", "10*mag", 1.0, 0.0); - gfits_define_bintable_column (header, "B", "CERROR", "astrometric error", "50*arcsec", 1.0, 0.0); - gfits_define_bintable_column (header, "B", "FWHM_X", "PSF x width", "25*arcsec", 1.0, 0.0); - gfits_define_bintable_column (header, "B", "FWHM_Y", "PSF y width", "25*arcsec", 1.0, 0.0); - gfits_define_bintable_column (header, "B", "TRATE", "scan rate", "100 usec/pixel", 1.0, 0.0); - gfits_define_bintable_column (header, "B", "CCDNUM", "CCD ID number", "", 1.0, 0.0); - gfits_define_bintable_column (header, "J", "FLAGS", "image quality flags", "", 1.0, 0.0); - gfits_define_bintable_column (header, "J", "IMAGE_ID", "internal image ID", "", 1.0, 0.0); - gfits_define_bintable_column (header, "J", "PARENT_ID", "associated ref image", "", 1.0, 0.0); - gfits_define_bintable_column (header, "J", "EXTERN_ID", "external image ID", "", 1.0, 0.0); - gfits_define_bintable_column (header, "I", "SOURCE_ID", "analysis source ID", "", 1.0, 0.0); - gfits_define_bintable_column (header, "I", "NLINK_ASTROM", "mean number of matched measurements for astrometry", "", 1.0, 0.0); - gfits_define_bintable_column (header, "I", "NLINK_PHOTOM", "mean number of matched measurements for astrometry", "", 1.0, 0.0); - gfits_define_bintable_column (header, "I", "UBERCAL_DIST", "distance to nearest ubercal image", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "XPIX_SYS_ERR", "systematic astrometry error in X", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "YPIX_SYS_ERR", "systematic astrometry error in Y", "", 1.0, 0.0); - gfits_define_bintable_column (header, "E", "MAG_SYS_ERR", "systematic photometry error", "", 1.0, 0.0); - gfits_define_bintable_column (header, "I", "N_FIT_ASTROM", "number of stars used for astrometry cal", "", 1.0, 0.0); - gfits_define_bintable_column (header, "I", "N_FIT_PHOTOM", "number of stars used for photometry cal", "", 1.0, 0.0); - gfits_define_bintable_column (header, "J", "PHOTOM_MAP_ID", "reference to 2D zero point map", "", 1.0, 0.0); - gfits_define_bintable_column (header, "J", "ASTROM_MAP_ID", "reference to 2D astrometry map", "", 1.0, 0.0); - gfits_define_bintable_column (header, "8B", "PARENT", "pointer to parent mosaic (not save to disk)", "", 1.0, 0.0); -# endif return (TRUE); @@ -359,6 +303,6 @@ Ncols = ftable[0].header[0].Naxis[0]; - if (Ncols != 384) { - fprintf (stderr, "ERROR: mis-match in table size: width is %d but should be %d bytes\n", Ncols, 384); + if (Ncols != TABLE_WIDTH) { + fprintf (stderr, "ERROR: mis-match in table size: width is %d but should be %d bytes\n", Ncols, TABLE_WIDTH); return NULL; }