Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/Makefile.Targets =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/Makefile.Targets (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/Makefile.Targets (revision 36899) @@ -12,4 +12,5 @@ $(ASRC)/average-ps1-v3.$(ARCH).o \ $(ASRC)/average-ps1-v4.$(ARCH).o \ +$(ASRC)/average-ps1-v5.$(ARCH).o \ $(ASRC)/average-ps1-ref.$(ARCH).o \ $(ASRC)/secfilt.$(ARCH).o \ @@ -24,4 +25,5 @@ $(ASRC)/secfilt-ps1-v3.$(ARCH).o \ $(ASRC)/secfilt-ps1-v4.$(ARCH).o \ +$(ASRC)/secfilt-ps1-v5.$(ARCH).o \ $(ASRC)/secfilt-ps1-ref.$(ARCH).o \ $(ASRC)/measure.$(ARCH).o \ @@ -36,5 +38,10 @@ $(ASRC)/measure-ps1-v3.$(ARCH).o \ $(ASRC)/measure-ps1-v4.$(ARCH).o \ +$(ASRC)/measure-ps1-v5.$(ARCH).o \ $(ASRC)/measure-ps1-ref.$(ARCH).o \ +$(ASRC)/lensing.$(ARCH).o \ +$(ASRC)/lensing-ps1-v5.$(ARCH).o \ +$(ASRC)/lensobj.$(ARCH).o \ +$(ASRC)/lensobj-ps1-v5.$(ARCH).o \ $(ASRC)/missing.$(ARCH).o \ $(ASRC)/photcode.$(ARCH).o \ @@ -47,4 +54,5 @@ $(ASRC)/photcode-ps1-v3.$(ARCH).o \ $(ASRC)/photcode-ps1-v4.$(ARCH).o \ +$(ASRC)/photcode-ps1-v5.$(ARCH).o \ $(ASRC)/photcode-ps1-ref.$(ARCH).o \ $(ASRC)/image.$(ARCH).o \ @@ -60,4 +68,5 @@ $(ASRC)/image-ps1-v3.$(ARCH).o \ $(ASRC)/image-ps1-v4.$(ARCH).o \ +$(ASRC)/image-ps1-v5.$(ARCH).o \ $(ASRC)/image-ps1-ref.$(ARCH).o \ $(ASRC)/regimage.$(ARCH).o \ @@ -71,4 +80,5 @@ $(ASRC)/cmf-ps1-v3.$(ARCH).o \ $(ASRC)/cmf-ps1-v4.$(ARCH).o \ +$(ASRC)/cmf-ps1-v5.$(ARCH).o \ $(ASRC)/cmf-ps1-sv1.$(ARCH).o \ $(ASRC)/cmf-ps1-sv2.$(ARCH).o \ @@ -98,4 +108,5 @@ $(AINC)/average-ps1-v3.h \ $(AINC)/average-ps1-v4.h \ +$(AINC)/average-ps1-v5.h \ $(AINC)/average-ps1-ref.h \ $(AINC)/secfilt.h \ @@ -110,4 +121,5 @@ $(AINC)/secfilt-ps1-v3.h \ $(AINC)/secfilt-ps1-v4.h \ +$(AINC)/secfilt-ps1-v5.h \ $(AINC)/secfilt-ps1-ref.h \ $(AINC)/measure.h \ @@ -122,5 +134,10 @@ $(AINC)/measure-ps1-v3.h \ $(AINC)/measure-ps1-v4.h \ +$(AINC)/measure-ps1-v5.h \ $(AINC)/measure-ps1-ref.h \ +$(AINC)/lensing.h \ +$(AINC)/lensing-ps1-v5.h \ +$(AINC)/lensobj.h \ +$(AINC)/lensobj-ps1-v5.h \ $(AINC)/missing.h \ $(AINC)/photcode.h \ @@ -133,4 +150,5 @@ $(AINC)/photcode-ps1-v3.h \ $(AINC)/photcode-ps1-v4.h \ +$(AINC)/photcode-ps1-v5.h \ $(AINC)/photcode-ps1-ref.h \ $(AINC)/image.h \ @@ -146,4 +164,5 @@ $(AINC)/image-ps1-v3.h \ $(AINC)/image-ps1-v4.h \ +$(AINC)/image-ps1-v5.h \ $(AINC)/image-ps1-ref.h \ $(AINC)/regimage.h \ @@ -157,4 +176,5 @@ $(AINC)/cmf-ps1-v3.h \ $(AINC)/cmf-ps1-v4.h \ +$(AINC)/cmf-ps1-v5.h \ $(AINC)/cmf-ps1-sv1.h \ $(AINC)/cmf-ps1-sv2.h \ Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/average-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/average-ps1-v5.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/average-ps1-v5.d (revision 36899) @@ -2,5 +2,5 @@ EXTNAME DVO_AVERAGE_PS1_V5 TYPE BINTABLE -SIZE 168 +SIZE 176 DESCRIPTION DVO Average Object Table @@ -40,10 +40,13 @@ FIELD Nmissing, NMISSING, unsigned short, number of missings FIELD Nlensing, NLENSING, unsigned short, number of lensing measurements +FIELD Nlensobj, NLENSOBJ, unsigned short, number of lensing measurements FIELD Nextend, NEXTEND, unsigned short, number of extended measurements -FIELD padding, PADDING, short FIELD measureOffset, OFF_MEASURE, uint32_t, offset to first psf measurement FIELD missingOffset, OFF_MISSING, uint32_t, offset to first missing obs FIELD lensingOffset, OFF_LENSING, uint32_t, offset to first lensing obs +FIELD lensobjOffset, OFF_LENSOBJ, uint32_t, offset to mean lensing data +FIELD extendOffset, OFF_EXTEND, uint32_t, offset to extended object entry + FIELD refColor, REF_COLOR, float, color of reference stars @@ -59,6 +62,6 @@ FIELD extIDgc, EXT_ID_GC, uint64_t, external ID for object in galactic coords -# 4 double, 2 uint64_t, 17 float, 10 int, 6 short -# 4*8 + 2*8 + 17*4 + 10*4 + 6*2 = 168 +# 4 double, 2 uint64_t, 17 float, 12 int, 6 short +# 4*8 + 2*8 + 17*4 + 12*4 + 6*2 = 176 # for 5G objects, expect 840G Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/average.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/average.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/average.d (revision 36899) @@ -2,5 +2,5 @@ EXTNAME DVO_AVERAGE TYPE BINTABLE -SIZE 128 +SIZE 176 DESCRIPTION DVO Average Object Table @@ -19,4 +19,9 @@ FIELD dP, PAR_ERR, float, parallax error, arcsec +FIELD Rstk, RA_STK, double, RA on stack, decimal degrees +FIELD Dstk, DEC_STK, double, DEC on stack, decimal degrees +FIELD dRstk, RA_STK_ERR, float, RA error on stack, arcsec +FIELD dDstk, DEC_STK_ERR, float, DEC error on stack, arcsec + FIELD ChiSqAve, CHISQ_POS, float, astrometry analysis chisq FIELD ChiSqPM, CHISQ_PM, float, astrometry analysis chisq @@ -34,8 +39,14 @@ FIELD Nmeasure, NMEASURE, unsigned short, number of psf measurements FIELD Nmissing, NMISSING, unsigned short, number of missings +FIELD Nlensing, NLENSING, unsigned short, number of lensing measurements +FIELD Nlensobj, NLENSOBJ, unsigned short, number of lensing measurements FIELD Nextend, NEXTEND, unsigned short, number of extended measurements FIELD measureOffset, OFF_MEASURE, int, offset to first psf measurement FIELD missingOffset, OFF_MISSING, int, offset to first missing obs +FIELD lensingOffset, OFF_LENSING, uint32_t, offset to first lensing obs +FIELD lensobjOffset, OFF_LENSOBJ, uint32_t, offset to mean lensing data +FIELD extendOffset, OFF_EXTEND, uint32_t, offset to extended object entry + FIELD refColor, REF_COLOR, float, color of astrometry ref stars @@ -49,4 +60,5 @@ FIELD catID, CAT_ID, unsigned int, unique ID for table in which object was first realized FIELD extID, EXT_ID, uint64_t, external ID for object (eg PSPS objID) +FIELD extIDgc, EXT_ID_GC, uint64_t, external ID for object in galactic coords # this structure should only be used for internal representations @@ -56,7 +68,6 @@ # *** 20090206 : new fields : ChiSq, Npos, flags (was code, uint16_t), extID - # *** 20100331 : new fields needed to assess astrometry analysis quality: - +# *** 20140617 : new fields : Rstk, Dstk, dRstk,dDstk, Nlensing, Nlensobj, lensingOffset, lensobjOffset, refColor # photflagsUpper & photflagsLower: we have Nmeasures of a given source Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/cmf-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/cmf-ps1-v5.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/cmf-ps1-v5.d (revision 36899) @@ -3,5 +3,5 @@ EXTNAME CMF_PS1_V5 TYPE BINTABLE -SIZE 216 +SIZE 232 # elements of data structure / FITS table @@ -74,3 +74,2 @@ # model shape parameters: F_major, F_minor, F_theta # centroid errors: sigma_X, sigma_Y, sigma_XY - Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/image-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/image-ps1-v5.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/image-ps1-v5.d (revision 36899) @@ -1,4 +1,4 @@ -STRUCT Image_PS1_V4 -EXTNAME DVO_IMAGE_PS1_V4 +STRUCT Image_PS1_V5 +EXTNAME DVO_IMAGE_PS1_V5 TYPE BINTABLE SIZE 360 @@ -42,5 +42,5 @@ FIELD DECo, DEC_CENTER, float, image center, degrees FIELD Radius, RADIUS, float, image radius, degrees -FIELD refColor, REF_COLOR, float, dummy +FIELD refColor, REF_COLOR, float, median astrometry ref color # should we define the max length of name as a macro? Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/image.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/image.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/image.d (revision 36899) @@ -44,5 +44,5 @@ FIELD DECo, DEC_CENTER, float, image center, degrees FIELD Radius, RADIUS, float, image radius, degrees -FIELD refColor, REF_COLOR, float, dummy +FIELD refColor, REF_COLOR, float, median astrometry ref color FIELD name, NAME, char[121], name of original image Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensing-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensing-ps1-v5.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensing-ps1-v5.d (revision 36899) @@ -1,6 +1,6 @@ -STRUCT Lensing_PS1_V4 -EXTNAME DVO_LENSING_PS1_V4 +STRUCT Lensing_PS1_V5 +EXTNAME DVO_LENSING_PS1_V5 TYPE BINTABLE -SIZE 96 +SIZE 128 DESCRIPTION DVO Lensing Table @@ -29,4 +29,14 @@ FIELD E2_sh_psf, E2_SH_PSF, float, lensing shear psf stars E2 +FIELD F_ApR5, FLUX_AP_R5, float, Flux inside r = 5 +FIELD dF_ApR5, FLUX_ERR_AP_R5, float, Flux inside r = 5 +FIELD sF_ApR5, FLUX_STD_AP_R5, float, Flux inside r = 5 +FIELD fF_ApR5, FLUX_FIL_AP_R5, float, Flux inside r = 5 + +FIELD F_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD dF_ApR6, FLUX_ERR_AP_R6, float, Flux inside r = 5 +FIELD sF_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD fF_ApR6, FLUX_AP_R6, float, Flux inside r = 5 + FIELD detID, DET_ID, unsigned int, detection ID FIELD objID, OBJ_ID, unsigned int, unique ID for object in table @@ -34,6 +44,6 @@ FIELD pad, PAD, int -# 20 x float +# 28 x float # 4 x int -# = 96 bytes / detection +# = 128 bytes / detection # for 2.5G objects + 60 overlaps, expect 15TB for forced warp Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensing.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensing.d (revision 36899) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensing.d (revision 36899) @@ -0,0 +1,49 @@ +STRUCT Lensing +EXTNAME DVO_LENSING +TYPE BINTABLE +SIZE 128 +DESCRIPTION DVO Lensing Table + +FIELD X11_sm_obj, X11_SM_OBJ, float, lensing smear object X11 +FIELD X12_sm_obj, X12_SM_OBJ, float, lensing smear object X12 +FIELD X22_sm_obj, X22_SM_OBJ, float, lensing smear object X22 +FIELD E1_sm_obj, E1_SM_OBJ, float, lensing smear object E1 +FIELD E2_sm_obj, E2_SM_OBJ, float, lensing smear object E2 + +FIELD X11_sh_obj, X11_SH_OBJ, float, lensing shear object X11 +FIELD X12_sh_obj, X12_SH_OBJ, float, lensing shear object X12 +FIELD X22_sh_obj, X22_SH_OBJ, float, lensing shear object X22 +FIELD E1_sh_obj, E1_SH_OBJ, float, lensing shear object E1 +FIELD E2_sh_obj, E2_SH_OBJ, float, lensing shear object E2 + +FIELD X11_sm_psf, X11_SM_PSF, float, lensing smear psf stars X11 +FIELD X12_sm_psf, X12_SM_PSF, float, lensing smear psf stars X12 +FIELD X22_sm_psf, X22_SM_PSF, float, lensing smear psf stars X22 +FIELD E1_sm_psf, E1_SM_PSF, float, lensing smear psf stars E1 +FIELD E2_sm_psf, E2_SM_PSF, float, lensing smear psf stars E2 + +FIELD X11_sh_psf, X11_SH_PSF, float, lensing shear psf stars X11 +FIELD X12_sh_psf, X12_SH_PSF, float, lensing shear psf stars X12 +FIELD X22_sh_psf, X22_SH_PSF, float, lensing shear psf stars X22 +FIELD E1_sh_psf, E1_SH_PSF, float, lensing shear psf stars E1 +FIELD E2_sh_psf, E2_SH_PSF, float, lensing shear psf stars E2 + +FIELD F_ApR5, FLUX_AP_R5, float, Flux inside r = 5 +FIELD dF_ApR5, FLUX_ERR_AP_R5, float, Flux inside r = 5 +FIELD sF_ApR5, FLUX_STD_AP_R5, float, Flux inside r = 5 +FIELD fF_ApR5, FLUX_FIL_AP_R5, float, Flux inside r = 5 + +FIELD F_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD dF_ApR6, FLUX_ERR_AP_R6, float, Flux inside r = 5 +FIELD sF_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD fF_ApR6, FLUX_AP_R6, float, Flux inside r = 5 + +FIELD detID, DET_ID, unsigned int, detection ID +FIELD objID, OBJ_ID, unsigned int, unique ID for object in table +FIELD catID, CAT_ID, unsigned int, unique ID for table in which object was first realized +FIELD pad, PAD, int + +# 28 x float +# 4 x int +# = 128 bytes / detection +# for 2.5G objects + 60 overlaps, expect 15TB for forced warp Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensobj-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensobj-ps1-v5.d (revision 36899) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensobj-ps1-v5.d (revision 36899) @@ -0,0 +1,52 @@ +STRUCT Lensobj_PS1_V5 +EXTNAME DVO_LENSOBJ_PS1_V5 +TYPE BINTABLE +SIZE 136 +DESCRIPTION DVO Lensobj Table + +FIELD X11_sm_obj, X11_SM_OBJ, float, mean lensing smear object X11 +FIELD X12_sm_obj, X12_SM_OBJ, float, mean lensing smear object X12 +FIELD X22_sm_obj, X22_SM_OBJ, float, mean lensing smear object X22 +FIELD E1_sm_obj, E1_SM_OBJ, float, mean lensing smear object E1 +FIELD E2_sm_obj, E2_SM_OBJ, float, mean lensing smear object E2 + +FIELD X11_sh_obj, X11_SH_OBJ, float, mean lensing shear object X11 +FIELD X12_sh_obj, X12_SH_OBJ, float, mean lensing shear object X12 +FIELD X22_sh_obj, X22_SH_OBJ, float, mean lensing shear object X22 +FIELD E1_sh_obj, E1_SH_OBJ, float, mean lensing shear object E1 +FIELD E2_sh_obj, E2_SH_OBJ, float, mean lensing shear object E2 + +FIELD X11_sm_psf, X11_SM_PSF, float, mean lensing smear psf stars X11 +FIELD X12_sm_psf, X12_SM_PSF, float, mean lensing smear psf stars X12 +FIELD X22_sm_psf, X22_SM_PSF, float, mean lensing smear psf stars X22 +FIELD E1_sm_psf, E1_SM_PSF, float, mean lensing smear psf stars E1 +FIELD E2_sm_psf, E2_SM_PSF, float, mean lensing smear psf stars E2 + +FIELD X11_sh_psf, X11_SH_PSF, float, mean lensing shear psf stars X11 +FIELD X12_sh_psf, X12_SH_PSF, float, mean lensing shear psf stars X12 +FIELD X22_sh_psf, X22_SH_PSF, float, mean lensing shear psf stars X22 +FIELD E1_sh_psf, E1_SH_PSF, float, mean lensing shear psf stars E1 +FIELD E2_sh_psf, E2_SH_PSF, float, mean lensing shear psf stars E2 + +FIELD F_ApR5, FLUX_AP_R5, float, Flux inside r = 5 +FIELD dF_ApR5, FLUX_ERR_AP_R5, float, Flux inside r = 5 +FIELD sF_ApR5, FLUX_STD_AP_R5, float, Flux inside r = 5 +FIELD fF_ApR5, FLUX_FIL_AP_R5, float, Flux inside r = 5 + +FIELD F_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD dF_ApR6, FLUX_ERR_AP_R6, float, Flux inside r = 5 +FIELD sF_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD fF_ApR6, FLUX_AP_R6, float, Flux inside r = 5 + +FIELD gamma, GAMMA, float +FIELD E1, E1, float +FIELD E2, E2, float + +FIELD objID, OBJ_ID, unsigned int, unique ID for object in table +FIELD catID, CAT_ID, unsigned int, unique ID for table in which object was first realized +FIELD pad, PAD, int + +# 31 x float +# 3 x int +# = 136 bytes / detection +# for 2.5G objects + 60 overlaps, expect 15TB for forced warp Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensobj.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensobj.d (revision 36899) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/lensobj.d (revision 36899) @@ -0,0 +1,52 @@ +STRUCT Lensobj +EXTNAME DVO_LENSOBJ +TYPE BINTABLE +SIZE 136 +DESCRIPTION DVO Lensobj Table + +FIELD X11_sm_obj, X11_SM_OBJ, float, mean lensing smear object X11 +FIELD X12_sm_obj, X12_SM_OBJ, float, mean lensing smear object X12 +FIELD X22_sm_obj, X22_SM_OBJ, float, mean lensing smear object X22 +FIELD E1_sm_obj, E1_SM_OBJ, float, mean lensing smear object E1 +FIELD E2_sm_obj, E2_SM_OBJ, float, mean lensing smear object E2 + +FIELD X11_sh_obj, X11_SH_OBJ, float, mean lensing shear object X11 +FIELD X12_sh_obj, X12_SH_OBJ, float, mean lensing shear object X12 +FIELD X22_sh_obj, X22_SH_OBJ, float, mean lensing shear object X22 +FIELD E1_sh_obj, E1_SH_OBJ, float, mean lensing shear object E1 +FIELD E2_sh_obj, E2_SH_OBJ, float, mean lensing shear object E2 + +FIELD X11_sm_psf, X11_SM_PSF, float, mean lensing smear psf stars X11 +FIELD X12_sm_psf, X12_SM_PSF, float, mean lensing smear psf stars X12 +FIELD X22_sm_psf, X22_SM_PSF, float, mean lensing smear psf stars X22 +FIELD E1_sm_psf, E1_SM_PSF, float, mean lensing smear psf stars E1 +FIELD E2_sm_psf, E2_SM_PSF, float, mean lensing smear psf stars E2 + +FIELD X11_sh_psf, X11_SH_PSF, float, mean lensing shear psf stars X11 +FIELD X12_sh_psf, X12_SH_PSF, float, mean lensing shear psf stars X12 +FIELD X22_sh_psf, X22_SH_PSF, float, mean lensing shear psf stars X22 +FIELD E1_sh_psf, E1_SH_PSF, float, mean lensing shear psf stars E1 +FIELD E2_sh_psf, E2_SH_PSF, float, mean lensing shear psf stars E2 + +FIELD F_ApR5, FLUX_AP_R5, float, Flux inside r = 5 +FIELD dF_ApR5, FLUX_ERR_AP_R5, float, Flux inside r = 5 +FIELD sF_ApR5, FLUX_STD_AP_R5, float, Flux inside r = 5 +FIELD fF_ApR5, FLUX_FIL_AP_R5, float, Flux inside r = 5 + +FIELD F_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD dF_ApR6, FLUX_ERR_AP_R6, float, Flux inside r = 5 +FIELD sF_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD fF_ApR6, FLUX_AP_R6, float, Flux inside r = 5 + +FIELD gamma, GAMMA, float +FIELD E1, E1, float +FIELD E2, E2, float + +FIELD objID, OBJ_ID, unsigned int, unique ID for object in table +FIELD catID, CAT_ID, unsigned int, unique ID for table in which object was first realized +FIELD pad, PAD, int + +# 31 x float +# 3 x int +# = 136 bytes / detection +# for 2.5G objects + 60 overlaps, expect 15TB for forced warp Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/measure-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/measure-ps1-v5.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/measure-ps1-v5.d (revision 36899) @@ -1,4 +1,4 @@ -STRUCT Measure_PS1_V4 -EXTNAME DVO_MEASURE_PS1_V4 +STRUCT Measure_PS1_V5 +EXTNAME DVO_MEASURE_PS1_V5 TYPE BINTABLE SIZE 232 @@ -52,13 +52,12 @@ # internally, this is an unsigned int; however, we do NOT convert with TZERO/TSCAL on output FIELD detID, DET_ID, unsigned int, detection ID -FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID FIELD objID, OBJ_ID, unsigned int, unique ID for object in table FIELD catID, CAT_ID, unsigned int, unique ID for table in which object was first realized -FIELD padding, PADDING, int, padding to ensure 8byte blocks # extID needs to be on an 8-byte boundary - # PSPS uses a 64-bit detection ID FIELD extID, EXT_ID, uint64_t, external ID (eg PSPS detID) + +FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID # do we need more resolution than a short? should this be a log? @@ -98,7 +97,9 @@ FIELD photFlags, PHOT_FLAGS, unsigned int, flags supplied by photometry program +FIELD padding, PADDING, int, padding to ensure 8byte blocks + # 2 x double # 35 x float -# 10 x int or unsigned int +# 11 x int or unsigned int # 12 x short or unsigned short # 1 x uint64_t Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/measure.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/measure.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/measure.d (revision 36899) @@ -2,23 +2,26 @@ EXTNAME DVO_MEASURE TYPE BINTABLE -SIZE 184 +SIZE 228 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, M_CAL, float, image cal mag, mag -FIELD Map, M_APER, float, aperture mag, mag -FIELD Mkron, M_KRON, float, kron magnitude, mag -FIELD dMkron, M_KRON_ERR, float, kron magnitude error, mag -FIELD dM, MAG_ERR, float, mag error, mag -FIELD dMcal, MAG_CAL_ERR, float, systematic calibration error, mag -FIELD dt, M_TIME, float, exposure time, 2.5*log(exptime) +FIELD R, RA, double, RA at epoch, degrees +FIELD D, DEC, double, DEC at epoch, degrees +FIELD M, MAG, float, catalog mag, mag +FIELD dM, MAG_ERR, float, mag error, mag +FIELD Map, M_APER, float, aperture mag, mag +FIELD dMap, M_APER, float, aperture mag, mag +FIELD Mkron, M_KRON, float, kron magnitude, mag +FIELD dMkron, M_KRON_ERR, float, kron magnitude error, mag +FIELD Mcal, M_CAL, float, image cal mag, mag +FIELD dMcal, MAG_CAL_ERR, float, systematic calibration error, mag +FIELD dt, M_TIME, float, exposure time, 2.5*log(exptime) # for stacks only? -FIELD FluxPSF, FLUX_PSF, float, flux from psf fit, counts/sec? -FIELD dFluxPSF, FLUX_PSF_ERR, float, error on psf flux, counts/sec? -FIELD FluxKron, FLUX_KRON, float, flux from kron ap, counts/sec? -FIELD dFluxKron, FLUX_KRON_ERR, float, error on kron flux, counts/sec? +FIELD FluxPSF, FLUX_PSF, float, flux from psf fit, counts/sec +FIELD dFluxPSF, FLUX_PSF_ERR, float, error on psf flux, counts/sec +FIELD FluxKron, FLUX_KRON, float, flux from kron ap, counts/sec +FIELD dFluxKron, FLUX_KRON_ERR, float, error on kron flux, counts/sec +FIELD FluxAp, FLUX_AP, float, flux from ap, counts/sec +FIELD dFluxAp, FLUX_AP_ERR, float, error on ap flux, counts/sec # note that with airmass = 1.0 / cos(90 - alt), we have full alt/az representation @@ -33,4 +36,11 @@ FIELD Yfix, Y_FIX, float, Y coord after correction, pixels +FIELD XoffKH, X_OFF_KH, float, X offset from correction, pixels +FIELD YoffKH, Y_OFF_KH, float, Y offset from correction, pixels +FIELD XoffDCR, X_OFF_DCR, float, X offset from correction, pixels +FIELD YoffDCR, Y_OFF_DCR, float, Y offset from correction, pixels +FIELD XoffGAL, X_OFF_GAL, float, X offset from correction, pixels +FIELD YoffGAL, Y_OFF_GAL, float, Y offset from correction, pixels + # could these be packed into fewer bits? FIELD Sky, SKY_FLUX, float, local estimate of sky flux, counts/sec @@ -38,9 +48,7 @@ FIELD t, TIME, int, time in seconds (UNIX) -FIELD t_msec, TIME_MSEC, unsigned short, time fraction of second, milliseconds FIELD averef, AVE_REF, unsigned int, reference to average entry FIELD detID, DET_ID, unsigned int, detection ID -FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID FIELD objID, OBJ_ID, unsigned int, unique ID for object in table FIELD catID, CAT_ID, unsigned int, unique ID for table in which object was first realized @@ -48,4 +56,6 @@ # PSPS uses a 64-bit detection ID FIELD extID, EXT_ID, uint64_t, external ID (eg PSPS detID) + +FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID # do we need more resolution than a short? should this be a log? @@ -69,4 +79,8 @@ FIELD Myy, MYY, short, second moments in pixel coords, 1/100 of pixels^2 +# fractional exposure time +FIELD t_msec, TIME_MSEC, unsigned short, time fraction of second, milliseconds +FIELD photcode, PHOTCODE, unsigned short, photcode + # convert this to error in pixels on load? FIELD dXccd, X_CCD_ERR, short, X coord error on chip, 1/100 of pixels @@ -77,5 +91,4 @@ FIELD pltscale, PLTSCALE, float, plate scale, arcsec/pixel -FIELD photcode, PHOTCODE, unsigned short, photcode FIELD dbFlags, DB_FLAGS, unsigned int, flags supplied by analysis in database FIELD photFlags, PHOT_FLAGS, unsigned int, flags supplied by photometry program @@ -85,3 +98,6 @@ # Changed dbFlags, photFlags : uint16_t to uint64_t +# *** 20140617 : changed: dR,dD -> R,D (removed dependence on average.R,D) + added: dMap, FluxAp, dFluxAp, (X,Y)off(KH,DCR,GAL) + # XXX unsigned int values are probably not being saved in the FITS file correctly: no BZERO, BSCALE Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/photcode-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/photcode-ps1-v5.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/photcode-ps1-v5.d (revision 36899) @@ -1,4 +1,4 @@ -STRUCT PhotCode_PS1_V4 -EXTNAME DVO_PHOTCODE_PS1_V4 +STRUCT PhotCode_PS1_V5 +EXTNAME DVO_PHOTCODE_PS1_V5 TYPE BINTABLE SIZE 112 Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/secfilt-ps1-v5.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/secfilt-ps1-v5.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/secfilt-ps1-v5.d (revision 36899) @@ -8,8 +8,6 @@ FIELD M, MAG, float, average mag in this band, mags FIELD dM, MAG_ERR, float, formal error on average mag, mags - FIELD Map, MAG_AP, float, ave aperture mag in this band, mags FIELD dMap, MAG_AP_ERR, float, ave aperture mag in this band, mags - FIELD Mkron, MAG_KRON, float, ave kron mag in this band, mags FIELD dMkron, MAG_KRON_ERR, float, formal error on average kron mag, mags @@ -18,5 +16,4 @@ FIELD Mstdev, MAG_STDEV, float, standard deviation of measurements, mags FIELD Mmin, MAG_MIN, float, min accepted mag, mags - FIELD Mmax, MAG_MAX, float, max accepted mag, mags FIELD Xm, MAG_CHI, float, chisq on average mag, [100*log(value)] @@ -44,5 +41,5 @@ ## need an 8-byte boundary here ## -FIELD stackDetectID, STACK_DETECT_ID, uint64_t, detection ID on stack used for fluxes (if any) +FIELD stackDetectID, STACK_DETECT_ID, uint64_t, detection ID on stack used for fluxes (if any) ## *** this section is for forced-warp mean values *** Index: /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/secfilt.d =================================================================== --- /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/secfilt.d (revision 36898) +++ /branches/eam_branches/ipp-20140610/Ohana/src/libautocode/def/secfilt.d (revision 36899) @@ -2,28 +2,73 @@ EXTNAME DVO_SECFILT TYPE BINTABLE -SIZE 64 +SIZE 152 DESCRIPTION DVO SecFilt : Secondary Filter Data -# elements of data structure / FITS table +## *** this section is for per-exposure mean values *** (unlabled values are implicitly PSF values) FIELD M, MAG, float, average mag in this band, mags +FIELD dM, MAG_ERR, float, formal error on average mag, mags FIELD Map, MAG_AP, float, average mag in this band, mags +FIELD dMap, MAG_AP_ERR, float, formal error on average mag, mags FIELD Mkron, MAG_KRON, float, ave kron mag in this band, mags FIELD dMkron, MAG_KRON_ERR, float, formal error on average kron mag, mags -FIELD dM, MAG_ERR, float, formal error on average mag, mags + +# these statistics are PSF-specific +FIELD Mstdev, MAG_STDEV, float, standard deviation of measurements, mags +FIELD Mmin, MAG_MIN, float, minimum accepted mag, mags +FIELD Mmax, MAG_MAX, float, maximum accepted mag, mags FIELD Xm, MAG_CHI, float, chisq on average mag, [100*log(value)] -FIELD FluxPSF, FLUX_PSF, float, mean flux psf fit (PS1: stack) -FIELD dFluxPSF, FLUX_PSF_ERR, float, mean flux psf error -FIELD FluxKron, FLUX_KRON, float, mean flux kron ap (PS1: stack) -FIELD dFluxKron, FLUX_KRON_ERR, float, mean flux kron err -FIELD flags, FLAGS, uint32_t, photometry flags + FIELD Ncode, NCODE, short, number of detections in band FIELD Nused, NUSED, short, number of detections used in average -FIELD M_20, MAG_20, short, lower 20percent mag, millimags -FIELD M_80, MAG_80, short, upper 20percent mag, millimags +FIELD NusedKron, NUSED_KRON, short, number of detections used in average +FIELD NusedAp, NUSED_AP, short, number of detections used in average + +FIELD flags, FLAGS, uint32_t, photometry flags + +## *** this section is for stack values *** + +FIELD MpsfStk, MAG_PSF_STK, float, magnitude from stack (primary if available) +FIELD FpsfStk, FLUX_PSF_STK, float, flux from stack (primary if available) +FIELD dFpsfStk, FLUX_PSF_STK_ERR, float, mean flux psf error + +FIELD MkronStk, MAG_KRON_STK, float, magnitude from stack (primary if available) +FIELD FkronStk, FLUX_KRON_STK, float, flux from stack (primary if available) +FIELD dFkronStk, FLUX_KRON_STK_ERR, float, mean flux kron error + +FIELD MapStk, MAG_AP_STK, float, magnitude from stack (primary if available) +FIELD FapStk, FLUX_AP_STK, float, flux from stack (primary if available) +FIELD dFapStk, FLUX_AP_STK_ERR, float, mean flux ap error + +## need an 8-byte boundary here ## +FIELD stackDetectID, STACK_DETECT_ID, uint64_t, detection ID on stack used for fluxes (if any) + +## *** this section is for forced-warp mean values *** + +FIELD MpsfWrp, MAG_PSF_WRP, float, psf magnitude from stack (primary if available) +FIELD FpsfWrp, FLUX_PSF_WRP, float, psf flux from stack (primary if available) +FIELD dFpsfWrp, FLUX_PSF_WRP_ERR, float, mean flux psf error +FIELD sFpsfWrp, FLUX_PSF_WRP_STD, float, mean flux psf stdev + +FIELD MkronWrp, MAG_KRON_WRP, float, kron magnitude from stack (primary if available) +FIELD FkronWrp, FLUX_KRON_WRP, float, kron flux from stack (primary if available) +FIELD dFkronWrp, FLUX_KRON_WRP_ERR, float, mean flux kron error +FIELD sFkronWrp, FLUX_KRON_WRP_STD, float, mean flux kron stdev + +FIELD MapWrp, MAG_AP_WRP, float, aper magnitude from stack (primary if available) +FIELD FapWrp, FLUX_AP_WRP, float, aper flux from stack (primary if available) +FIELD dFapWrp, FLUX_AP_WRP_ERR, float, mean flux ap error +FIELD sFapWrp, FLUX_AP_WRP_STD, float, mean flux ap stdev + +FIELD NusedWrp, NUSED_WRP, short, number of detections used in average +FIELD NusedKronWrp, NUSED_KRON_WRP, short, number of detections used in average +FIELD NusedApWrp, NUSED_AP_WRP, short, number of detections used in average + FIELD ubercalDist, UBERCAL_DIST, short, number of images from an ubercal-image -FIELD Mstdev, MAG_STDEV, short, standard deviation of measurements, millimags -FIELD stackDetectID, STACK_DETECT_ID, uint64_t, detection ID on stack used for fluxes (if any) # *** 20090206 : new fields : M_20, M_80; dropped dummy # *** 20120302 : new fields : ubercalDist, Map, Mstdev # *** 20120710 : new fields : Mkron, dMkron, FluxPSF, dFluxPSF, FluxKron, dFluxKron, stackID + +# *** 20140617 : added : dMap, NusedKron, NusedAp, MpsfStk, MkronStk, MapStk, *Wrp + : changed : Mstdev, M_20 (to Mmin,short:float),M_80 (to Mmax,short:float), + : rename : FpsfStk, dFpsfStk, FkronStk, dFronStk (were FluxPSF, dFluxPSF, FluxKron, dFluxKron)