Index: trunk/Ohana/src/libdvo/include/dvo.h =================================================================== --- trunk/Ohana/src/libdvo/include/dvo.h (revision 37116) +++ trunk/Ohana/src/libdvo/include/dvo.h (revision 37246) @@ -464,5 +464,5 @@ } MeasureTiny; -/** STRUCT DEFINITION **/ +// alternate version of PS1_V4 (old dev version) typedef struct { double R; // RA (decimal degrees ) @@ -500,5 +500,5 @@ Average *Average_PS1_V4alt_ToInternal (Average_PS1_V4alt *in, off_t Nvalues); -/** STRUCT DEFINITION **/ +// alternate version of PS1_V4 (old dev version) typedef struct { float dR; // RA offset (arcsec) @@ -556,4 +556,107 @@ Measure *Measure_PS1_V4alt_ToInternal (Average *ave, Measure_PS1_V4alt *in, off_t Nvalues); +// alternate version of PS1_V5 (old dev version) +typedef struct { + float M; // average mag in this band (mags) + float dM; // formal error on average mag (mags) + float Map; // ave aperture mag in this band (mags) + float dMap; // ave aperture mag in this band (mags) + float sMap; // standard deviation of ap mags (mags) + float Mkron; // ave kron mag in this band (mags) + float dMkron; // formal error on average kron mag (mags) + float sMkron; // standard deviation of kron mags (mags) + float Mstdev; // standard deviation of measurements (mags) + float Mmin; // min accepted mag (mags) + float Mmax; // max accepted mag (mags) + float Mchisq; // chisq on average mag (value) + short Ncode; // number of detections in band + short Nused; // number of detections used in average + short NusedKron; // number of detections used in average + short NusedAp; // number of detections used in average + uint32_t flags; // photometry flags + float MpsfStk; // magnitude from stack (primary if available) + float FpsfStk; // flux from stack (primary if available) + float dFpsfStk; // mean flux psf error + float MkronStk; // magnitude from stack (primary if available) + float FkronStk; // flux from stack (primary if available) + float dFkronStk; // mean flux kron error + float MapStk; // magnitude from stack (primary if available) + float FapStk; // flux from stack (primary if available) + float dFapStk; // mean flux ap error + int stackPrmryOff; // measure entry which is primary stack detection + int stackBestOff; // measure entry which is best stack detection + float MpsfWrp; // psf magnitude from stack (primary if available) + float FpsfWrp; // psf flux from stack (primary if available) + float dFpsfWrp; // mean flux psf error + float sFpsfWrp; // mean flux psf stdev + float MkronWrp; // kron magnitude from stack (primary if available) + float FkronWrp; // kron flux from stack (primary if available) + float dFkronWrp; // mean flux kron error + float sFkronWrp; // mean flux kron stdev + float MapWrp; // aper magnitude from stack (primary if available) + float FapWrp; // aper flux from stack (primary if available) + float dFapWrp; // mean flux ap error + float sFapWrp; // mean flux ap stdev + short NusedWrp; // number of detections used in average + short NusedKronWrp; // number of detections used in average + short NusedApWrp; // number of detections used in average + short ubercalDist; // number of images from an ubercal-image +} SecFilt_PS1_V5alt; + +SecFilt_PS1_V5alt *gfits_table_get_SecFilt_PS1_V5alt (FTable *table, off_t *Ndata, char *swapped); +int gfits_convert_SecFilt_PS1_V5alt (SecFilt_PS1_V5alt *data, off_t size, off_t nitems); +SecFilt *SecFilt_PS1_V5alt_ToInternal (SecFilt_PS1_V5alt *in, off_t Nvalues); + +// alternate version of PS1_V5alt (old dev version) +typedef struct { + double R; // RA (decimal degrees ) + double D; // DEC (decimal degrees ) + float dR; // RA error (arcsec) + float dD; // DEC error (arcsec) + float uR; // RA*cos(D) proper-motion (arcsec/year) + float uD; // DEC proper-motion (arcsec/year) + float duR; // RA*cos(D) p-m error (arcsec/year) + float duD; // DEC p-m error (arcsec/year) + float P; // parallax (arcsec) + float dP; // parallax error (arcsec) + double Rstk; // RA on stack (decimal degrees ) + double Dstk; // DEC on stack (decimal degrees ) + float dRstk; // RA error on stack (arcsec) + float dDstk; // DEC error on stack (arcsec) + float ChiSqAve; // astrometry analysis chisq + float ChiSqPM; // astrometry analysis chisq + float ChiSqPar; // astrometry analysis chisq + int Tmean; // mean epoch (PM,PAR ref) (unix time seconds) + int Trange; // mean epoch (PM,PAR ref) (unix time seconds) + float psfQF; // psf coverage (bad masks) + float psfQFperf; // psf coverage (all masks) + float stargal; // star / galaxy separator (1/100 arcsec) + unsigned short Npos; // number of detections used for astrometry + unsigned short Nmeasure; // number of psf measurements + unsigned short Nmissing; // number of missings + unsigned short Nlensing; // number of lensing measurements + unsigned short Nlensobj; // number of lensing measurements + unsigned short Nextend; // number of extended measurements + int measureOffset; // offset to first psf measurement + int missingOffset; // offset to first missing obs + int lensingOffset; // offset to first lensing obs + int lensobjOffset; // offset to mean lensing data + int extendOffset; // offset to extended object entry + int paramsOffset; // offset to stellar parameter data + float refColorBlue; // color of astrometry ref stars + float refColorRed; // color of astrometry ref stars + uint32_t flags; // average object flags (star; ghost; etc) + uint32_t photFlagsUpper; // upper bit of 2 bit summary of per-measure photflags + uint32_t photFlagsLower; // lower bit of 2 bit summary of per-measure photflags + unsigned int objID; // unique ID for object in table + unsigned int catID; // unique ID for table in which object was first realized + uint64_t extID; // external ID for object (eg PSPS objID) + uint64_t extIDgc; // external ID for object in galactic coords +} Average_PS1_V5alt; + +Average_PS1_V5alt *gfits_table_get_Average_PS1_V5alt (FTable *table, off_t *Ndata, char *swapped); +int gfits_convert_Average_PS1_V5alt (Average_PS1_V5alt *data, off_t size, off_t nitems); +Average *Average_PS1_V5alt_ToInternal (Average_PS1_V5alt *in, off_t Nvalues); + /* for some reason I have merged the set of tables and the file description, so I need to have an internal structure to point to the separate files */