Index: trunk/Ohana/src/libautocode/Makefile.Targets =================================================================== --- trunk/Ohana/src/libautocode/Makefile.Targets (revision 15031) +++ trunk/Ohana/src/libautocode/Makefile.Targets (revision 15034) @@ -7,6 +7,5 @@ $(ASRC)/average-panstarrs-dev-0.$(ARCH).o \ $(ASRC)/average-panstarrs-dev-1.$(ARCH).o \ -$(ASRC)/average-panstarrs.$(ARCH).o \ -$(ASRC)/average-pmtest.$(ARCH).o \ +$(ASRC)/average-ps1-dev-1.$(ARCH).o \ $(ASRC)/secfilt.$(ARCH).o \ $(ASRC)/secfilt-loneos.$(ARCH).o \ @@ -14,5 +13,5 @@ $(ASRC)/secfilt-panstarrs-dev-0.$(ARCH).o \ $(ASRC)/secfilt-panstarrs-dev-1.$(ARCH).o \ -$(ASRC)/secfilt-panstarrs.$(ARCH).o \ +$(ASRC)/secfilt-ps1-dev-1.$(ARCH).o \ $(ASRC)/measure.$(ARCH).o \ $(ASRC)/measure-loneos.$(ARCH).o \ @@ -20,5 +19,5 @@ $(ASRC)/measure-panstarrs-dev-0.$(ARCH).o \ $(ASRC)/measure-panstarrs-dev-1.$(ARCH).o \ -$(ASRC)/measure-panstarrs.$(ARCH).o \ +$(ASRC)/measure-ps1-dev-1.$(ARCH).o \ $(ASRC)/missing.$(ARCH).o \ $(ASRC)/photcode.$(ARCH).o \ @@ -28,5 +27,5 @@ $(ASRC)/image-panstarrs-dev-0.$(ARCH).o \ $(ASRC)/image-panstarrs-dev-1.$(ARCH).o \ -$(ASRC)/image-panstarrs.$(ARCH).o \ +$(ASRC)/image-ps1-dev-1.$(ARCH).o \ $(ASRC)/regimage.$(ARCH).o \ $(ASRC)/detreg.$(ARCH).o \ @@ -34,4 +33,5 @@ $(ASRC)/photreg-old.$(ARCH).o \ $(ASRC)/ps1_dev_0.$(ARCH).o \ +$(ASRC)/ps1_dev_1.$(ARCH).o \ $(ASRC)/smpdata.$(ARCH).o \ $(ASRC)/spectrum.$(ARCH).o \ @@ -49,6 +49,5 @@ $(AINC)/average-panstarrs-dev-0.h \ $(AINC)/average-panstarrs-dev-1.h \ -$(AINC)/average-panstarrs.h \ -$(AINC)/average-pmtest.h \ +$(AINC)/average-ps1-dev-1.h \ $(AINC)/secfilt.h \ $(AINC)/secfilt-loneos.h \ @@ -56,5 +55,5 @@ $(AINC)/secfilt-panstarrs-dev-0.h \ $(AINC)/secfilt-panstarrs-dev-1.h \ -$(AINC)/secfilt-panstarrs.h \ +$(AINC)/secfilt-ps1-dev-1.h \ $(AINC)/measure.h \ $(AINC)/measure-loneos.h \ @@ -62,5 +61,5 @@ $(AINC)/measure-panstarrs-dev-0.h \ $(AINC)/measure-panstarrs-dev-1.h \ -$(AINC)/measure-panstarrs.h \ +$(AINC)/measure-ps1-dev-1.h \ $(AINC)/missing.h \ $(AINC)/photcode.h \ @@ -70,5 +69,5 @@ $(AINC)/image-panstarrs-dev-0.h \ $(AINC)/image-panstarrs-dev-1.h \ -$(AINC)/image-panstarrs.h \ +$(AINC)/image-ps1-dev-1.h \ $(AINC)/regimage.h \ $(AINC)/detreg.h \ @@ -76,4 +75,5 @@ $(AINC)/photreg-old.h \ $(AINC)/ps1_dev_0.h \ +$(AINC)/ps1_dev_1.h \ $(AINC)/smpdata.h \ $(AINC)/spectrum.h \ Index: trunk/Ohana/src/libautocode/def/Stars.d =================================================================== --- trunk/Ohana/src/libautocode/def/Stars.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/Stars.d (revision 15034) @@ -2,5 +2,5 @@ EXTNAME STARS TYPE BINTABLE -SIZE 232 +SIZE 240 FIELD X, X, double, x coordinate on image, pixels @@ -33,4 +33,6 @@ FIELD dt, EXPTIME, float, exposure time, 2.5*log(exptime) FIELD psfProb, PSF_PROB, float +FIELD crNsigma, CR_NSIGMA, float +FIELD extNsigma, EXT_NSIGMA, float FIELD psfQual, PSF_QUAL, float FIELD Mcal, MCAL, float, image cal mag, mag @@ -44,5 +46,5 @@ # double: 24 * 8 : 192 -# int/float: 8 * 4 : 32 +# int/float:10 * 4 : 40 # short: 2 * 2 : 4 # char: 4 * 1 : 4 Index: trunk/Ohana/src/libautocode/def/average-elixir.d =================================================================== --- trunk/Ohana/src/libautocode/def/average-elixir.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/average-elixir.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT AverageElixir +STRUCT Average_Elixir EXTNAME DVO_AVERAGE_ELIXIR TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/average-loneos.d =================================================================== --- trunk/Ohana/src/libautocode/def/average-loneos.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/average-loneos.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT AverageLoneos +STRUCT Average_Loneos EXTNAME DVO_AVERAGE_LONEOS TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/average-panstarrs-dev-0.d =================================================================== --- trunk/Ohana/src/libautocode/def/average-panstarrs-dev-0.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/average-panstarrs-dev-0.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT AveragePanstarrs_DEV_0 +STRUCT Average_Panstarrs_DEV_0 EXTNAME DVO_AVERAGE_PANSTARRS_DEV_0 TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/average-panstarrs-dev-1.d =================================================================== --- trunk/Ohana/src/libautocode/def/average-panstarrs-dev-1.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/average-panstarrs-dev-1.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT AveragePanstarrs_DEV_1 +STRUCT Average_Panstarrs_DEV_1 EXTNAME DVO_AVERAGE_PANSTARRS_DEV_1 TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/average-panstarrs.d =================================================================== --- trunk/Ohana/src/libautocode/def/average-panstarrs.d (revision 15031) +++ (revision ) @@ -1,22 +1,0 @@ -STRUCT AveragePanstarrs -EXTNAME DVO_AVERAGE_PANSTARRS -TYPE BINTABLE -SIZE 48 - -# elements of data structure / FITS table - -FIELD R, RA, double, RA, decimal degrees -FIELD D, DEC, double, DEC, decimal degrees -FIELD M, MAG, float, primary mag, mag -FIELD dM, MAG_ERR, float, error on primary mag, mag -FIELD Xp, SIGMA_POS, short, position scatter, 1/100 arcsec -FIELD Xm, CHISQ_MAG, short, chisq for primary mag, [100*log(value)] -FIELD Xg, CHISQ_GAL, short, chisq for galaxy mag [100*log(value)] -FIELD Nm, NMEAS, unsigned short, number of measures -FIELD Nn, NMISS, unsigned short, number of missings -FIELD code, code, unsigned short, ID code (star; ghost; etc) -FIELD offset, offset, int, offset to first measurement -FIELD missing, missing, int, offset to first missing obs -FIELD dummy, dummy, int, extra space - -# change this table eventually to a temp name and provide a script to fix existing DBs Index: trunk/Ohana/src/libautocode/def/average-pmtest.d =================================================================== --- trunk/Ohana/src/libautocode/def/average-pmtest.d (revision 15031) +++ (revision ) @@ -1,32 +1,0 @@ -STRUCT AveragePMtest -EXTNAME DVO_AVERAGE_PMTEST -TYPE BINTABLE -SIZE 80 -DESCRIPTION DVO Average Object Table - -# elements of data structure / FITS table - -FIELD R, RA, double, RA, decimal degrees -FIELD D, DEC, double, DEC, decimal degrees -FIELD dR, RA_ERR, float, RA error arcsec -FIELD dD, DEC_ERR, float, DEC error arcsec - -FIELD uR, U_RA, float, RA*cos(D) proper-motion, arcsec/year -FIELD uD, U_DEC, float, DEC proper-motion, arcsec/year -FIELD duR, V_RA_ERR, float, RA*cos(D) p-m error, arcsec/year -FIELD duD, V_DEC_ERR, float, DEC p-m error, arcsec/year -FIELD P, PAR, float, parallax, arcsec -FIELD dP, PAR_ERR, float, parallax error, arcsec - -FIELD M, MAG, float, primary mag, mag -FIELD dM, MAG_ERR, float, error on primary mag, mag -FIELD Xp, SIGMA_POS, short, position scatter, 1/100 arcsec -FIELD Xm, CHISQ_MAG, short, chisq for primary mag, [100*log(value)] -FIELD Xg, CHISQ_GAL, short, chisq for galaxy mags, [100*log(value)] -FIELD Nm, NMEAS, unsigned short, number of measures -FIELD Nn, NMISS, unsigned short, number of missings -FIELD code, code, unsigned short, ID code (star; ghost; etc) -FIELD offset, offset, int, offset to first measurement -FIELD missing, missing, int, offset to first missing obs -FIELD dummy, dummy, int, extra space - Index: trunk/Ohana/src/libautocode/def/average-ps1-dev-1.d =================================================================== --- trunk/Ohana/src/libautocode/def/average-ps1-dev-1.d (revision 15034) +++ trunk/Ohana/src/libautocode/def/average-ps1-dev-1.d (revision 15034) @@ -0,0 +1,49 @@ +STRUCT Average_PS1_DEV_1 +EXTNAME DVO_AVERAGE_PS1_DEV_1 +TYPE BINTABLE +SIZE 72 +DESCRIPTION DVO Average Object Table + +# elements of data structure / FITS table + +FIELD R, RA, double, RA, decimal degrees +FIELD D, DEC, double, DEC, decimal degrees +FIELD dR, RA_ERR, float, RA error arcsec +FIELD dD, DEC_ERR, float, DEC error arcsec + +FIELD uR, U_RA, float, RA*cos(D) proper-motion, arcsec/year +FIELD uD, U_DEC, float, DEC proper-motion, arcsec/year +FIELD duR, V_RA_ERR, float, RA*cos(D) p-m error, arcsec/year +FIELD duD, V_DEC_ERR, float, DEC p-m error, arcsec/year +FIELD P, PAR, float, parallax, arcsec +FIELD dP, PAR_ERR, float, parallax error, arcsec + +# XXX drop the old primary magnitude concept +# FIELD M, MAG, float, primary mag, mag +# FIELD dM, MAG_ERR, float, error on primary mag, mag +# FIELD Xm, CHISQ_MAG, short, chisq for primary mag, [100*log(value)] +# FIELD Xg, CHISQ_GAL, short, chisq for galaxy mags, [100*log(value)] + +FIELD Xp, SIGMA_POS, short, position scatter, 1/100 arcsec +FIELD Nm, NMEAS, unsigned short, number of measures +FIELD Nn, NMISS, unsigned short, number of missings +FIELD code, code, unsigned short, ID code (star; ghost; etc) +FIELD offset, offset, int, offset to first measurement +FIELD missing, missing, int, offset to first missing obs + +# Pan-STARRS uses a 64-bit detection ID. keep this in two 32 bit ints for backwards compatibility? +FIELD objID_hi, OBJ_ID_HI, unsigned int, ID upper bytes +FIELD objID_lo, OBJ_ID_LO, unsigned int, ID lower bytes + +# this structure should only be used for internal representations +# the average-FORMAT structures should be used for external representations +# note that the average magnitudes are stored in the 'secfilt' table (change this name??) +# the index for the secfilt table is just Nsecfilt times the index for the average table. + +# XXX after the rest of the DVO re-org work, remove the magnitude based values from this table +# and move them to the secfilt table. + +# the DVO object IDs are generated internally and are not equivalent to the PSPS object IDs +# probably need to add position chisq + +# XXX include the number of measurements used to determine the positional information? Index: trunk/Ohana/src/libautocode/def/image-ascii.d =================================================================== --- trunk/Ohana/src/libautocode/def/image-ascii.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/image-ascii.d (revision 15034) @@ -15,2 +15,4 @@ FIELD sky, SKY, float[7.1], median sky flux, counts FIELD Nstar, NSTAR, int[6], Number of stars in image, stars + +## XXX is this used? Index: trunk/Ohana/src/libautocode/def/image-elixir.d =================================================================== --- trunk/Ohana/src/libautocode/def/image-elixir.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/image-elixir.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT ImageElixir +STRUCT Image_Elixir EXTNAME DVO_IMAGE_ELIXIR TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/image-loneos.d =================================================================== --- trunk/Ohana/src/libautocode/def/image-loneos.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/image-loneos.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT ImageLoneos +STRUCT Image_Loneos EXTNAME DVO_IMAGE_LONEOS TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/image-panstarrs-dev-0.d =================================================================== --- trunk/Ohana/src/libautocode/def/image-panstarrs-dev-0.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/image-panstarrs-dev-0.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT ImagePanstarrs_DEV_0 +STRUCT Image_Panstarrs_DEV_0 EXTNAME DVO_IMAGE_PANSTARRS_DEV_0 TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/image-panstarrs-dev-1.d =================================================================== --- trunk/Ohana/src/libautocode/def/image-panstarrs-dev-1.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/image-panstarrs-dev-1.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT ImagePanstarrs_DEV_1 +STRUCT Image_Panstarrs_DEV_1 EXTNAME DVO_IMAGE_PANSTARRS_DEV_1 TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/image-panstarrs.d =================================================================== --- trunk/Ohana/src/libautocode/def/image-panstarrs.d (revision 15031) +++ (revision ) @@ -1,65 +1,0 @@ -STRUCT ImagePanstarrs -EXTNAME DVO_IMAGE_PANSTARRS -TYPE BINTABLE -SIZE 248 - -# elements of the image structure - -SUBSTRUCT coords, COORDS, Coords, astrometric data -SUBFIELD crval1, CRVAL1, double, coordinate at reference pixel -SUBFIELD crval2, CRVAL2, double, coordinate at reference pixel -SUBFIELD crpix1, CRPIX1, float, coordinate of reference pixel -SUBFIELD crpix2, CRPIX2, float, coordinate of reference pixel -SUBFIELD cdelt1, CDELT1, float, degrees per pixel -SUBFIELD cdelt2, CDELT2, float, degrees per pixel -SUBFIELD pc1_1, PC1_1, float, rotation matrix -SUBFIELD pc1_2, PC1_2, float, rotation matrix -SUBFIELD pc2_1, PC2_1, float, rotation matrix -SUBFIELD pc2_2, PC2_2, float, rotation matrix -SUBFIELD polyterms, POLYTERMS, float[7][2], higher order warping terms -SUBFIELD ctype, CTYPE, char[15], coordinate type -SUBFIELD Npolyterms, NPOLYTERMS, char, order of polynomial -# 120 bytes - -FIELD tzero, TZERO, e_time, readout time (row 0) -FIELD nstar, NSTAR, unsigned int, number of stars on image -FIELD secz, SECZ, float, airmass, mag -FIELD NX, NX, short, image width -FIELD NY, NY, short, image height -FIELD apmifit, APMIFIT, float, aperture correction, mag -FIELD dapmifit, DAPMIFIT, float, apmifit error, mag -FIELD Mcal, MCAL, float, calibration mag, mag -FIELD dMcal, DMCAL, float, error on Mcal, mag -FIELD Xm, XM, short, image chisq, 10*log(value) -FIELD source, SOURCE, short, identifier for CCD, -FIELD exptime, EXPTIME, float, exposure time, seconds -# 40 bytes - -FIELD name, NAME, char[32], name of original image -FIELD detection_limit, DETECTION_LIMIT, unsigned char, detection limit, 10*mag -FIELD saturation_limit, SATURATION_LIMIT, unsigned char, saturation limit, 10*mag -FIELD cerror, CERROR, unsigned char, astrometric error, 50*arcsec -FIELD fwhm_x, FWHM_X, unsigned char, PSF x width, 25*arcsec -FIELD fwhm_y, FWHM_Y, unsigned char, PSF y width, 25*arcsec -FIELD trate, TRATE, unsigned char, scan rate, 100 usec/pixel -FIELD code, CODE, char, image quality flag -FIELD ccdnum, CCDNUM, unsigned char, CCD ID number -# 40 bytes - -FIELD dummy, DUMMY, char[18], unused -FIELD order, ORDER, short, Mrel 2D polynomical order -FIELD Mx, MX, short, Mrel polyterm -FIELD My, MY, short, Mrel polyterm -FIELD Mxx, MXX, short, Mrel polyterm -FIELD Mxy, MXY, short, Mrel polyterm -FIELD Myy, MYY, short, Mrel polyterm -FIELD Mxxx, MXXX, short, Mrel polyterm -FIELD Mxxy, MXXY, short, Mrel polyterm -FIELD Mxyy, MXYY, short, Mrel polyterm -FIELD Myyy, MYYY, short, Mrel polyterm -FIELD Mxxxx, MXXXX, short, Mrel polyterm -FIELD Mxxxy, MXXXY, short, Mrel polyterm -FIELD Mxxyy, MXXYY, short, Mrel polyterm -FIELD Mxyyy, MXYYY, short, Mrel polyterm -FIELD Myyyy, MYYYY, short, Mrel polyterm -# 48 bytes Index: trunk/Ohana/src/libautocode/def/image-ps1-dev-1.d =================================================================== --- trunk/Ohana/src/libautocode/def/image-ps1-dev-1.d (revision 15034) +++ trunk/Ohana/src/libautocode/def/image-ps1-dev-1.d (revision 15034) @@ -0,0 +1,70 @@ +STRUCT Image_PS1_DEV_1 +EXTNAME DVO_IMAGE_PS1_DEV_1 +TYPE BINTABLE +SIZE 288 +DESCRIPTION DVO Image Table + +# elements of the image structure + +SUBSTRUCT coords, COORDS, Coords, astrometric data +SUBFIELD crval1, CRVAL1, double, coordinate at reference pixel +SUBFIELD crval2, CRVAL2, double, coordinate at reference pixel +SUBFIELD crpix1, CRPIX1, float, coordinate of reference pixel +SUBFIELD crpix2, CRPIX2, float, coordinate of reference pixel +SUBFIELD cdelt1, CDELT1, float, degrees per pixel +SUBFIELD cdelt2, CDELT2, float, degrees per pixel +SUBFIELD pc1_1, PC1_1, float, rotation matrix +SUBFIELD pc1_2, PC1_2, float, rotation matrix +SUBFIELD pc2_1, PC2_1, float, rotation matrix +SUBFIELD pc2_2, PC2_2, float, rotation matrix +SUBFIELD polyterms, POLYTERMS, float[7][2], higher order warping terms +SUBFIELD ctype, CTYPE, char[15], coordinate type +SUBFIELD Npolyterms, NPOLYTERMS, char, order of polynomial +# 120 bytes + +FIELD tzero, TZERO, e_time, readout time (row 0) +FIELD nstar, NSTAR, unsigned int, number of stars on image +FIELD secz, SECZ, float, airmass, mag +FIELD NX, NX, short, image width +FIELD NY, NY, short, image height +FIELD apmifit, APMIFIT, float, aperture correction, mag +FIELD dapmifit, DAPMIFIT, float, apmifit error, mag +FIELD Mcal, MCAL, float, calibration mag, mag +FIELD dMcal, DMCAL, float, error on Mcal, mag +FIELD Xm, XM, short, image chisq, 10*log(value) +FIELD photcode, PHOTCODE, short, identifier for CCD, +FIELD exptime, EXPTIME, float, exposure time, seconds +FIELD sidtime, ST, float, sidereal time of exposure +FIELD latitude, LAT, float, observatory latitude, degrees +# 40 bytes + +FIELD name, NAME, char[64], name of original image +FIELD detection_limit, DETECTION_LIMIT, unsigned char, detection limit, 10*mag +FIELD saturation_limit, SATURATION_LIMIT, unsigned char, saturation limit, 10*mag +FIELD cerror, CERROR, unsigned char, astrometric error, 50*arcsec +FIELD fwhm_x, FWHM_X, unsigned char, PSF x width, 25*arcsec +FIELD fwhm_y, FWHM_Y, unsigned char, PSF y width, 25*arcsec +FIELD trate, TRATE, unsigned char, scan rate, 100 usec/pixel +FIELD code, CODE, char, image quality flag +FIELD ccdnum, CCDNUM, unsigned char, CCD ID number +FIELD imageID_hi, IMAGE_ID_HI, unsigned int, ID upper bytes +FIELD imageID_lo, IMAGE_ID_LO, unsigned int, ID lower bytes +# 48 bytes + +FIELD dummy, DUMMY, char[10], unused +FIELD order, ORDER, short, Mrel 2D polynomical order +FIELD Mx, MX, short, Mrel polyterm +FIELD My, MY, short, Mrel polyterm +FIELD Mxx, MXX, short, Mrel polyterm +FIELD Mxy, MXY, short, Mrel polyterm +FIELD Myy, MYY, short, Mrel polyterm +FIELD Mxxx, MXXX, short, Mrel polyterm +FIELD Mxxy, MXXY, short, Mrel polyterm +FIELD Mxyy, MXYY, short, Mrel polyterm +FIELD Myyy, MYYY, short, Mrel polyterm +FIELD Mxxxx, MXXXX, short, Mrel polyterm +FIELD Mxxxy, MXXXY, short, Mrel polyterm +FIELD Mxxyy, MXXYY, short, Mrel polyterm +FIELD Mxyyy, MXYYY, short, Mrel polyterm +FIELD Myyyy, MYYYY, short, Mrel polyterm +# 40 bytes Index: trunk/Ohana/src/libautocode/def/measure-elixir.d =================================================================== --- trunk/Ohana/src/libautocode/def/measure-elixir.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/measure-elixir.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT MeasureElixir +STRUCT Measure_Elixir EXTNAME DVO_MEASURE_ELIXIR TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/measure-loneos.d =================================================================== --- trunk/Ohana/src/libautocode/def/measure-loneos.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/measure-loneos.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT MeasureLoneos +STRUCT Measure_Loneos EXTNAME DVO_MEASURE_LONEOS TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/measure-panstarrs-dev-0.d =================================================================== --- trunk/Ohana/src/libautocode/def/measure-panstarrs-dev-0.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/measure-panstarrs-dev-0.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT MeasurePanstarrs_DEV_0 +STRUCT Measure_Panstarrs_DEV_0 EXTNAME DVO_MEASURE_PANSTARRS_DEV_0 TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/measure-panstarrs-dev-1.d =================================================================== --- trunk/Ohana/src/libautocode/def/measure-panstarrs-dev-1.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/measure-panstarrs-dev-1.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT MeasurePanstarrs_DEV_1 +STRUCT Measure_Panstarrs_DEV_1 EXTNAME DVO_MEASURE_PANSTARRS_DEV_1 TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/measure-panstarrs.d =================================================================== --- trunk/Ohana/src/libautocode/def/measure-panstarrs.d (revision 15031) +++ (revision ) @@ -1,24 +1,0 @@ -STRUCT MeasurePanstarrs -EXTNAME DVO_MEASURE_PANSTARRS -TYPE BINTABLE -SIZE 52 - -# elements of data structure / FITS table - -FIELD dR, D_RA, float, RA offset, arcsec -FIELD dD, D_DEC, float, DEC offset, arcsec -FIELD M, MAG, float, catalog mag, mag -FIELD dM, dM, float, mag error, mag -FIELD Mcal, Mcal, float, image cal mag, mag -FIELD Mgal, Mgal, float, galaxy mag, mag -FIELD airmass, airmass, float, (airmass - 1), airmass -FIELD dt, dt, float, exposure time, 2.5*log(exptime) -FIELD FWx, FWx, short, object fwhm major axis, 1/100 of arcsec -FIELD FWy, FWy, short, object fwhm minor axis, 1/100 of arcsec -FIELD theta, theta, unsigned char, angle wrt ccd X dir, (0xff/360) deg -FIELD dophot, dophot, char, dophot type -FIELD source, source, unsigned short, photcode -FIELD flags, flags, unsigned short, flags for various uses -FIELD dummy, dummy, short, extra space -FIELD t, t, unsigned int, time in seconds (UNIX) -FIELD averef, averef, unsigned int, reference to average entry Index: trunk/Ohana/src/libautocode/def/measure-ps1-dev-1.d =================================================================== --- trunk/Ohana/src/libautocode/def/measure-ps1-dev-1.d (revision 15034) +++ trunk/Ohana/src/libautocode/def/measure-ps1-dev-1.d (revision 15034) @@ -0,0 +1,59 @@ +STRUCT Measure_PS1_DEV_1 +EXTNAME DVO_MEASURE_PS1_DEV_1 +TYPE BINTABLE +SIZE 96 +DESCRIPTION DVO Detection Measurement Table + +FIELD dR, D_RA, float, RA offset, arcsec +FIELD dD, D_DEC, float, DEC offset, arcsec +FIELD M, MAG, float, catalog mag, mag +FIELD Mcal, Mcal, float, image cal mag, mag +FIELD Mgal, Mgal, float, galaxy mag, mag +FIELD dM, dM, float, mag error, mag +FIELD dt, dt, float, exposure time, 2.5*log(exptime) + +# note that with airmass = 1.0 / cos(90 - alt), we have full alt/az representation +FIELD airmass, airmass, float, (airmass - 1), airmass +FIELD az, AZ, float, telescope azimuth + +# new field elements needed for Pan-STARRS: +FIELD Xccd, X_CCD, float, X coord on chip, pixels +FIELD Yccd, Y_CCD, float, Y coord on chip, pixels + +# could these be packed into fewer bits? +FIELD Sky, SKY_FLUX, float, local estimate of sky flux, counts/sec +FIELD dSky, SKY_FLUX_ERR, float, local estimate of sky flux, counts/sec + +FIELD t, t, unsigned int, time in seconds (UNIX) +FIELD averef, averef, unsigned int, reference to average entry + +# Pan-STARRS uses a 64-bit detection ID. keep this in two 32 bit ints for backwards compatibility? +FIELD detID_hi, DET_ID_HI, unsigned int, ID upper bytes +FIELD detID_lo, DET_ID_LO, unsigned int, ID lower bytes + +FIELD imageID_hi, IMAGE_ID_HI, unsigned int, reference to image +FIELD imageID_lo, IMAGE_ID_LO, unsigned int, reference to image + +FIELD FWx, FWx, short, object fwhm major axis, 1/100 of arcsec +FIELD FWy, FWy, short, object fwhm minor axis, 1/100 of arcsec +FIELD theta, theta, short, angle wrt ccd X dir, (0xffff/360) deg +FIELD photcode, photcode, unsigned short, photcode + +FIELD flags, flags, unsigned short, flags for various uses + +FIELD dXccd, X_CCD_ERR, short, X coord error on chip, pixels +FIELD dYccd, Y_CCD_ERR, short, Y coord error on chip, pixels + +# do we need more resolution than a short? should this be a log? +FIELD qPSF, PSF_QF, short, psf coverage/quality factor + +FIELD dophot, dophot, char, dophot type +FIELD stargal, stargal, char, star-galaxy separator + +# we need extra bytes for padding purposes... +FIELD dummy, dummy, char[2], padding + +# float : 13 x 4 = 52 +# int: 6 x 4 = 24 +# short: 8 x 2 = 16 +# char : 2 = 2 Index: trunk/Ohana/src/libautocode/def/ps1_dev_1.d =================================================================== --- trunk/Ohana/src/libautocode/def/ps1_dev_1.d (revision 15034) +++ trunk/Ohana/src/libautocode/def/ps1_dev_1.d (revision 15034) @@ -0,0 +1,26 @@ +# name of structure type +STRUCT PS1_DEV_1 +EXTNAME PS1_DEV_1 +TYPE BINTABLE +SIZE 72 + +# elements of data structure / FITS table +FIELD detID, IPP_IDET, unsigned int, detection ID +FIELD X, X_PSF, float, x coord, pixels +FIELD Y, Y_PSF, float, y coord, pixels +FIELD dX, X_PSF_SIG, float, x coord error, pixels +FIELD dY, Y_PSF_SIG, float, y coord error, pixels +FIELD M, PSF_INST_MAG, float, inst mags, mags +FIELD dM, PSF_INST_MAG_SIG, float, inst mag error, mags +FIELD Mpeak, PEAK_FLUX_AS_MAG, float, inst mag error, mags +FIELD sky, SKY, float, sky flux, cnts/sec +FIELD dSky, SKY_SIG, float, sky flux errorf cnts/sec +FIELD psfProb, PSF_PROBABILITY, float, psf probability +FIELD crNsigma, CR_NSIGMA, float, Nsigma deviations from PSF to CF +FIELD extNsigma, EXT_NSIGMA, float, Nsigma deviations from PSF to EXT +FIELD fx, PSF_WIDTH_X, float, semi-major, pixels +FIELD fy, PSF_WIDTH_Y, float, semi-minor, pixels +FIELD df, PSF_THETA, float, ellipse angle, degrees +FIELD psfQual, PSF_QF, float, quality factor +FIELD nFrames, N_FRAMES, short, images overlapping peak +FIELD dummy, DUMMY, short, padding Index: trunk/Ohana/src/libautocode/def/secfilt-elixir.d =================================================================== --- trunk/Ohana/src/libautocode/def/secfilt-elixir.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/secfilt-elixir.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT SecFiltElixir +STRUCT SecFilt_Elixir EXTNAME DVO_SECFILT_ELIXIR TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/secfilt-loneos.d =================================================================== --- trunk/Ohana/src/libautocode/def/secfilt-loneos.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/secfilt-loneos.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT SecFiltLoneos +STRUCT SecFilt_Loneos EXTNAME DVO_SECFILT_LONEOS TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/secfilt-panstarrs-dev-0.d =================================================================== --- trunk/Ohana/src/libautocode/def/secfilt-panstarrs-dev-0.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/secfilt-panstarrs-dev-0.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT SecFiltPanstarrs_DEV_0 +STRUCT SecFilt_Panstarrs_DEV_0 EXTNAME DVO_SECFILT_PANSTARRS_DEV_0 TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/secfilt-panstarrs-dev-1.d =================================================================== --- trunk/Ohana/src/libautocode/def/secfilt-panstarrs-dev-1.d (revision 15031) +++ trunk/Ohana/src/libautocode/def/secfilt-panstarrs-dev-1.d (revision 15034) @@ -1,3 +1,3 @@ -STRUCT SecFiltPanstarrs_DEV_1 +STRUCT SecFilt_Panstarrs_DEV_1 EXTNAME DVO_SECFILT_PANSTARRS_DEV_1 TYPE BINTABLE Index: trunk/Ohana/src/libautocode/def/secfilt-panstarrs.d =================================================================== --- trunk/Ohana/src/libautocode/def/secfilt-panstarrs.d (revision 15031) +++ (revision ) @@ -1,10 +1,0 @@ -STRUCT SecFiltPanstarrs -EXTNAME DVO_SECFILT_PANSTARRS -TYPE BINTABLE -SIZE 12 - -# elements of data structure / FITS table -FIELD M, MAG, float, other mags, mags -FIELD dM, MAG_ERR, float, scatter on mag 1e4*mag -FIELD Xm, MAG_CHI, short, chisq on mag, [100*log(value)] -FIELD dummy, JUNK, short, chisq on mag, [100*log(value)] Index: trunk/Ohana/src/libautocode/def/secfilt-ps1-dev-1.d =================================================================== --- trunk/Ohana/src/libautocode/def/secfilt-ps1-dev-1.d (revision 15034) +++ trunk/Ohana/src/libautocode/def/secfilt-ps1-dev-1.d (revision 15034) @@ -0,0 +1,13 @@ +STRUCT SecFilt_PS1_DEV_1 +EXTNAME DVO_SECFILT_PS1_DEV_1 +TYPE BINTABLE +SIZE 16 +DESCRIPTION DVO SecFilt : Secondary Filter Data + +# elements of data structure / FITS table +FIELD M, MAG, float, other mags, mags +FIELD dM, MAG_ERR, float, scatter on mag, mags +FIELD Xm, MAG_CHI, short, chisq on mag, [100*log(value)] +FIELD Ncode, NCODE, short, number of detections in band +FIELD Nused, NUSED, short, number of detections used in average +FIELD dummy, JUNK, short, place holder