Index: trunk/Ohana/src/addstar/src/ReadStarsFITS.c =================================================================== --- trunk/Ohana/src/addstar/src/ReadStarsFITS.c (revision 37990) +++ trunk/Ohana/src/addstar/src/ReadStarsFITS.c (revision 37992) @@ -4,23 +4,24 @@ // (excluding SDSS data and reference database info, such as 2MASS) // NOTE: these must also be listed in MatchHeaders.c (line ~ 62) -Stars *Convert_SMPDATA PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_DEV_0 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_DEV_1 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_V1 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_V1_Alt PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_V2 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_V3 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_V4 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_V5 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_V5_Lensing PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_V5_Lensing_Alt PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_SV1 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_SV1_Alt PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_SV2 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_SV3 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_SV4 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_DV3 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_DV4 PROTO((FTable *table, unsigned int *nstars)); -Stars *Convert_PS1_DV5 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_SMPDATA PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_DEV_0 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_DEV_1 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V1 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V1_Alt PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V2 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V3 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V4 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V5 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V5_R0_Lensing PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V5_R1_Lensing PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_V5_R2_Lensing PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_SV1 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_SV1_Alt PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_SV2 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_SV3 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_SV4 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_DV3 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_DV4 PROTO((FTable *table, unsigned int *nstars)); +Stars *Convert_PS1_DV5 PROTO((FTable *table, unsigned int *nstars)); // given a file with the pointer at the start of the table block and the @@ -86,8 +87,11 @@ break; case 312: - stars = Convert_PS1_V5_Lensing_Alt (&table, &Nstars); + stars = Convert_PS1_V5_R0_Lensing (&table, &Nstars); break; case 320: - stars = Convert_PS1_V5_Lensing (&table, &Nstars); + stars = Convert_PS1_V5_R1_Lensing (&table, &Nstars); + break; + case 328: + stars = Convert_PS1_V5_R2_Lensing (&table, &Nstars); break; default: @@ -864,5 +868,5 @@ } -Stars *Convert_PS1_V5_Lensing (FTable *table, unsigned int *nstars) { +Stars *Convert_PS1_V5_R0_Lensing (FTable *table, unsigned int *nstars) { off_t Nstars; @@ -870,7 +874,7 @@ double ZeroPt; Stars *stars; - CMF_PS1_V5_Lensing *ps1data; - - ps1data = gfits_table_get_CMF_PS1_V5_Lensing (table, &Nstars, NULL); + CMF_PS1_V5_R0_Lensing *ps1data; + + ps1data = gfits_table_get_CMF_PS1_V5_R0_Lensing (table, &Nstars, NULL); if (!ps1data) { fprintf (stderr, "skipping inconsistent entry\n"); @@ -989,5 +993,5 @@ } -Stars *Convert_PS1_V5_Lensing_Alt (FTable *table, unsigned int *nstars) { +Stars *Convert_PS1_V5_R1_Lensing (FTable *table, unsigned int *nstars) { off_t Nstars; @@ -995,7 +999,7 @@ double ZeroPt; Stars *stars; - CMF_PS1_V5_Lensing_Alt *ps1data; - - ps1data = gfits_table_get_CMF_PS1_V5_Lensing_Alt (table, &Nstars, NULL); + CMF_PS1_V5_R1_Lensing *ps1data; + + ps1data = gfits_table_get_CMF_PS1_V5_R1_Lensing (table, &Nstars, NULL); if (!ps1data) { fprintf (stderr, "skipping inconsistent entry\n"); @@ -1114,5 +1118,5 @@ } -Stars *Convert_PS1_SV1 (FTable *table, unsigned int *nstars) { +Stars *Convert_PS1_V5_R2_Lensing (FTable *table, unsigned int *nstars) { off_t Nstars; @@ -1120,12 +1124,7 @@ double ZeroPt; Stars *stars; - CMF_PS1_SV1 *ps1data; - - if (table[0].header[0].Naxis[0] == 196) { - stars = Convert_PS1_SV1_Alt (table, nstars); - return (stars); - } - - ps1data = gfits_table_get_CMF_PS1_SV1 (table, &Nstars, NULL); + CMF_PS1_V5_R2_Lensing *ps1data; + + ps1data = gfits_table_get_CMF_PS1_V5_R2_Lensing (table, &Nstars, NULL); if (!ps1data) { fprintf (stderr, "skipping inconsistent entry\n"); @@ -1153,4 +1152,134 @@ stars[i].measure.dMcal = ps1data[i].dMcal; stars[i].measure.Map = ps1data[i].Map + ZeroPt; + stars[i].measure.dMap = (ps1data[i].apFlux > 0.0) ? fabs(ps1data[i].apFluxErr / ps1data[i].apFlux) : NAN; + + stars[i].measure.Mkron = (ps1data[i].kronFlux > 0.0) ? -2.5*log10(ps1data[i].kronFlux) + ZeroPt : NAN; + stars[i].measure.dMkron = (ps1data[i].kronFlux > 0.0) ? ps1data[i].kronFluxErr / ps1data[i].kronFlux : NAN; + + // these fluxes are converted from counts to counts/sec in FilterStars.c + stars[i].measure.FluxPSF = GetFluxFromFluxOrMag (ps1data[i].Flux, ps1data[i].M); + stars[i].measure.dFluxPSF = GetFluxErrFromFluxOrMag (ps1data[i].dFlux, stars[i].measure.FluxPSF, ps1data[i].dM); + stars[i].measure.FluxKron = ps1data[i].kronFlux; + stars[i].measure.dFluxKron = ps1data[i].kronFluxErr; + stars[i].measure.FluxAp = GetFluxFromFluxOrMag (ps1data[i].apFlux, ps1data[i].Map); + stars[i].measure.dFluxAp = GetFluxErrFromFluxOrMag (ps1data[i].apFluxErr, stars[i].measure.FluxAp, stars[i].measure.dMap); + + stars[i].measure.Sky = ps1data[i].sky; + stars[i].measure.dSky = ps1data[i].dSky; + + stars[i].measure.psfChisq = ps1data[i].psfChisq; + stars[i].measure.psfQF = ps1data[i].psfQF; + stars[i].measure.psfQFperf = ps1data[i].psfQFperf; + + stars[i].measure.psfNdof = ps1data[i].psfNdof; + stars[i].measure.psfNpix = ps1data[i].psfNpix; + stars[i].measure.extNsigma = ps1data[i].extNsigma; + + stars[i].measure.FWx = ToShortPixels(ps1data[i].fx); + stars[i].measure.FWy = ToShortPixels(ps1data[i].fy); + stars[i].measure.theta = ToShortDegrees(ps1data[i].df); + + stars[i].measure.Mxx = ToShortPixels(ps1data[i].Mxx); + stars[i].measure.Mxy = ToShortPixels(ps1data[i].Mxy); + stars[i].measure.Myy = ToShortPixels(ps1data[i].Myy); + + stars[i].measure.photFlags = ps1data[i].flags; + stars[i].measure.photFlags2 = ps1data[i].flags2; + + // this is may optionally be replaced by the internal sequence (see FilterStars.c) + stars[i].measure.detID = ps1data[i].detID; + + ALLOCATE (stars[i].lensing, Lensing, 1); + dvo_lensing_init (stars[i].lensing); + + stars[i].lensing->X11_sm_obj = ps1data[i].X11_sm_obj; + stars[i].lensing->X12_sm_obj = ps1data[i].X12_sm_obj; + stars[i].lensing->X22_sm_obj = ps1data[i].X22_sm_obj; + stars[i].lensing->E1_sm_obj = ps1data[i].E1_sm_obj; + stars[i].lensing->E2_sm_obj = ps1data[i].E2_sm_obj; + + stars[i].lensing->X11_sh_obj = ps1data[i].X11_sh_obj; + stars[i].lensing->X12_sh_obj = ps1data[i].X12_sh_obj; + stars[i].lensing->X22_sh_obj = ps1data[i].X22_sh_obj; + stars[i].lensing->E1_sh_obj = ps1data[i].E1_sh_obj; + stars[i].lensing->E2_sh_obj = ps1data[i].E2_sh_obj; + + stars[i].lensing->X11_sm_psf = ps1data[i].X11_sm_psf; + stars[i].lensing->X12_sm_psf = ps1data[i].X12_sm_psf; + stars[i].lensing->X22_sm_psf = ps1data[i].X22_sm_psf; + stars[i].lensing->E1_sm_psf = ps1data[i].E1_sm_psf; + stars[i].lensing->E2_sm_psf = ps1data[i].E2_sm_psf; + + stars[i].lensing->X11_sh_psf = ps1data[i].X11_sh_psf; + stars[i].lensing->X12_sh_psf = ps1data[i].X12_sh_psf; + stars[i].lensing->X22_sh_psf = ps1data[i].X22_sh_psf; + stars[i].lensing->E1_sh_psf = ps1data[i].E1_sh_psf; + stars[i].lensing->E2_sh_psf = ps1data[i].E2_sh_psf; + + // stars[i].lensing->F_ApR5 = ps1data[i].F_ApR5; + // stars[i].lensing->dF_ApR5 = ps1data[i].dF_ApR5; + // stars[i].lensing->sF_ApR5 = ps1data[i].sF_ApR5; + // stars[i].lensing->fF_ApR5 = ps1data[i].fF_ApR5; + // + // stars[i].lensing->F_ApR6 = ps1data[i].F_ApR6; + // stars[i].lensing->dF_ApR6 = ps1data[i].dF_ApR6; + // stars[i].lensing->sF_ApR6 = ps1data[i].sF_ApR6; + // stars[i].lensing->fF_ApR6 = ps1data[i].fF_ApR6; + + // this is may optionally be replaced by the internal sequence (see FilterStars.c) + stars[i].lensing->detID = ps1data[i].detID; + + // the Average fields and the following Measure fields are set in FilterStars after + // the image metadata is in hand: dR, dD, Mcal, dt, airmass, az, t, imageID, extID. + + // averef is set in find_matches + + // dbFlags is zero on ingest. + + // the following fields are currently not being set anywhere: t_msec + } + *nstars = Nstars; + return (stars); +} + +Stars *Convert_PS1_SV1 (FTable *table, unsigned int *nstars) { + + off_t Nstars; + unsigned int i; + double ZeroPt; + Stars *stars; + CMF_PS1_SV1 *ps1data; + + if (table[0].header[0].Naxis[0] == 196) { + stars = Convert_PS1_SV1_Alt (table, nstars); + return (stars); + } + + ps1data = gfits_table_get_CMF_PS1_SV1 (table, &Nstars, NULL); + if (!ps1data) { + fprintf (stderr, "skipping inconsistent entry\n"); + return (NULL); + } + ZeroPt = GetZeroPoint(); + + ALLOCATE (stars, Stars, Nstars); + for (i = 0; i < Nstars; i++) { + InitStar (&stars[i]); + stars[i].measure.Xccd = ps1data[i].X; + stars[i].measure.Yccd = ps1data[i].Y; + stars[i].measure.dXccd = ToShortPixels(ps1data[i].dX); + stars[i].measure.dYccd = ToShortPixels(ps1data[i].dY); + + stars[i].measure.posangle = ToShortDegrees(ps1data[i].posangle); + stars[i].measure.pltscale = ps1data[i].pltscale; + + if ((ps1data[i].M >= 0.0) || isnan(ps1data[i].M)) { + stars[i].measure.M = NAN; + } else { + stars[i].measure.M = ps1data[i].M + ZeroPt; + } + stars[i].measure.dM = ps1data[i].dM; + stars[i].measure.dMcal = ps1data[i].dMcal; + stars[i].measure.Map = ps1data[i].Map + ZeroPt; stars[i].measure.dMap = ps1data[i].dM; // a proxy measure Index: trunk/Ohana/src/libautocode/def/lensing-ps1-v5-alt.d =================================================================== --- trunk/Ohana/src/libautocode/def/lensing-ps1-v5-alt.d (revision 37990) +++ (revision ) @@ -1,49 +1,0 @@ -STRUCT Lensing_PS1_V5_ALT -EXTNAME DVO_LENSING_PS1_V5_ALT -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, error on Flux inside r = 5 -FIELD sF_ApR5, FLUX_STD_AP_R5, float, stdev of Flux inside r = 5 -FIELD fF_ApR5, FLUX_FIL_AP_R5, float, fill factor for Flux inside r = 5 - -FIELD F_ApR6, FLUX_AP_R6, float, Flux inside r = 5 -FIELD dF_ApR6, FLUX_ERR_AP_R6, float, error on Flux inside r = 5 -FIELD sF_ApR6, FLUX_STD_AP_R6, float, stdev of Flux inside r = 5 -FIELD fF_ApR6, FLUX_FIL_AP_R6, float, fill factor for 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 averef, AVE_REF, unsigned int, reference to average entry - -# 28 x float -# 4 x int -# = 128 bytes / detection -# for 2.5G objects + 60 overlaps, expect 15TB for forced warp Index: trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r0.d =================================================================== --- trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r0.d (revision 37992) +++ trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r0.d (revision 37992) @@ -0,0 +1,49 @@ +STRUCT Lensing_PS1_V5_R0 +EXTNAME DVO_LENSING_PS1_V5_R0 +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, error on Flux inside r = 5 +FIELD sF_ApR5, FLUX_STD_AP_R5, float, stdev of Flux inside r = 5 +FIELD fF_ApR5, FLUX_FIL_AP_R5, float, fill factor for Flux inside r = 5 + +FIELD F_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD dF_ApR6, FLUX_ERR_AP_R6, float, error on Flux inside r = 5 +FIELD sF_ApR6, FLUX_STD_AP_R6, float, stdev of Flux inside r = 5 +FIELD fF_ApR6, FLUX_FIL_AP_R6, float, fill factor for 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 averef, AVE_REF, unsigned int, reference to average entry + +# 28 x float +# 4 x int +# = 128 bytes / detection +# for 2.5G objects + 60 overlaps, expect 15TB for forced warp Index: trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r1.d =================================================================== --- trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r1.d (revision 37992) +++ trunk/Ohana/src/libautocode/def/lensing-ps1-v5-r1.d (revision 37992) @@ -0,0 +1,52 @@ +STRUCT Lensing_PS1_V5_R1 +EXTNAME DVO_LENSING_PS1_V5 +TYPE BINTABLE +SIZE 136 +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, error on Flux inside r = 5 +FIELD sF_ApR5, FLUX_STD_AP_R5, float, stdev of Flux inside r = 5 +FIELD fF_ApR5, FLUX_FIL_AP_R5, float, fill factor for Flux inside r = 5 + +FIELD F_ApR6, FLUX_AP_R6, float, Flux inside r = 5 +FIELD dF_ApR6, FLUX_ERR_AP_R6, float, error on Flux inside r = 5 +FIELD sF_ApR6, FLUX_STD_AP_R6, float, stdev of Flux inside r = 5 +FIELD fF_ApR6, FLUX_FIL_AP_R6, float, fill factor for 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 averef, AVE_REF, unsigned int, reference to average entry + +FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID +FIELD padding, PADDING, unsigned int, reference to DVO image ID + +# 28 x float +# 4 x int +# = 128 bytes / detection +# for 2.5G objects + 60 overlaps, expect 15TB for forced warp Index: trunk/Ohana/src/libautocode/def/lensing-ps1-v5.d =================================================================== --- trunk/Ohana/src/libautocode/def/lensing-ps1-v5.d (revision 37990) +++ (revision ) @@ -1,52 +1,0 @@ -STRUCT Lensing_PS1_V5 -EXTNAME DVO_LENSING_PS1_V5 -TYPE BINTABLE -SIZE 136 -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, error on Flux inside r = 5 -FIELD sF_ApR5, FLUX_STD_AP_R5, float, stdev of Flux inside r = 5 -FIELD fF_ApR5, FLUX_FIL_AP_R5, float, fill factor for Flux inside r = 5 - -FIELD F_ApR6, FLUX_AP_R6, float, Flux inside r = 5 -FIELD dF_ApR6, FLUX_ERR_AP_R6, float, error on Flux inside r = 5 -FIELD sF_ApR6, FLUX_STD_AP_R6, float, stdev of Flux inside r = 5 -FIELD fF_ApR6, FLUX_FIL_AP_R6, float, fill factor for 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 averef, AVE_REF, unsigned int, reference to average entry - -FIELD imageID, IMAGE_ID, unsigned int, reference to DVO image ID -FIELD padding, PADDING, unsigned int, reference to DVO image ID - -# 28 x float -# 4 x int -# = 128 bytes / detection -# for 2.5G objects + 60 overlaps, expect 15TB for forced warp Index: trunk/Ohana/src/libautocode/def/lensing.d =================================================================== --- trunk/Ohana/src/libautocode/def/lensing.d (revision 37990) +++ trunk/Ohana/src/libautocode/def/lensing.d (revision 37992) @@ -2,5 +2,5 @@ EXTNAME DVO_LENSING TYPE BINTABLE -SIZE 136 +SIZE 144 DESCRIPTION DVO Lensing Table @@ -29,4 +29,7 @@ FIELD E2_sh_psf, E2_SH_PSF, float, lensing shear psf stars E2 +FIELD E1_psf, E1_PSF, float, polarization psf stars E1 +FIELD E2_psf, E2_PSF, float, polarization psf stars E2 + FIELD F_ApR5, FLUX_AP_R5, float, Flux inside r = 5 FIELD dF_ApR5, FLUX_ERR_AP_R5, float, error on Flux inside r = 5 Index: trunk/Ohana/src/libdvo/Makefile =================================================================== --- trunk/Ohana/src/libdvo/Makefile (revision 37990) +++ trunk/Ohana/src/libdvo/Makefile (revision 37992) @@ -43,6 +43,7 @@ $(DESTINC)/cmf-ps1-sv3.h \ $(DESTINC)/cmf-ps1-sv4.h \ -$(DESTINC)/cmf-ps1-v5-lensing.h \ -$(DESTINC)/cmf-ps1-v5-lensing-alt.h +$(DESTINC)/cmf-ps1-v5-r0-lensing.h \ +$(DESTINC)/cmf-ps1-v5-r1-lensing.h \ +$(DESTINC)/cmf-ps1-v5-r2-lensing.h INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h $(DESTINC)/dvodb.h $(DESTINC)/libdvo_astro.h $(DESTINC)/convert.h $(DESTINC)/get_graphdata.h @@ -102,6 +103,7 @@ $(SRC)/cmf-ps1-sv4.$(ARCH).o \ $(SRC)/cmf-ps1-v5.$(ARCH).o \ -$(SRC)/cmf-ps1-v5-lensing.$(ARCH).o \ -$(SRC)/cmf-ps1-v5-lensing-alt.$(ARCH).o \ +$(SRC)/cmf-ps1-v5-r0-lensing.$(ARCH).o \ +$(SRC)/cmf-ps1-v5-r1-lensing.$(ARCH).o \ +$(SRC)/cmf-ps1-v5-r2-lensing.$(ARCH).o \ $(SRC)/dvo_util.$(ARCH).o \ $(SRC)/dbBooleanCond.$(ARCH).o \ Index: trunk/Ohana/src/libdvo/include/cmf-ps1-v5-lensing-alt.h =================================================================== --- trunk/Ohana/src/libdvo/include/cmf-ps1-v5-lensing-alt.h (revision 37990) +++ (revision ) @@ -1,93 +1,0 @@ - -/** STRUCT DEFINITION **/ -typedef struct { - unsigned int detID; // detection ID - float X; // x coord (pixels) - float Y; // y coord (pixels) - float dX; // x coord error (pixels) - float dY; // y coord error (pixels) - float posangle; // Posangle at source (degrees) - float pltscale; // Plate Scale at source (arcsec/pixel) - float M; // inst mags (mags) - float dM; // inst mag error (mags) - float Flux; // psf flux (counts) - float dFlux; // psf flux error (counts ) - float Map; // standard aperture mag (mags) - float MapRaw; // raw aperture mag (mags) - float apRadius; // radius used for aper (pixels) - float apFlux; // aperture flux (counts) - float apFluxErr; // error on ap flux (counts) - int apNpix; // pixels used by aper (pixels) - float Mcalib; // calibrated psf mag (mags) - float dMcal; // zero point scatter (mags) - float Mpeak; // peak flux as a mag (mags) - double RA; // PSF RA coord (degrees) - double DEC; // PSF DEC coord (degrees) - float sky; // sky flux (cnts/sec) - float dSky; // sky flux error (cnts/sec) - float psfChisq; // psf fit chisq - float crNsigma; // Nsigma deviations from PSF to CF - float extNsigma; // Nsigma deviations from PSF to EXT - float fx; // psf fit major axis (pixels) - float fy; // psf fit minor axis (pixels) - float df; // ellipse angle (degrees) - float k; // extra PSF parameter (unitless) - float fwhmMaj; // true fwhm of psf (pixels) - float fwhmMin; // true fwhm (minor) (pixels) - float psfQF; // quality factor - float psfQFperf; // quality factor perfect - int psfNdof; // psf degrees of freedom - int psfNpix; // psf number of pixels - float Mxx; // second moment X (pixels^2) - float Mxy; // second moment Y (pixels^2) - float Myy; // second moment XY (pixels^2) - float M3c; // third moment cos(t) (pixels^3) - float M3s; // third moment sin(t) (pixels^3) - float M4c; // fourth moment cos(t) (pixels^4) - float M4s; // fourth moment sin(t) (pixels^4) - - float X11_sm_obj; // lensing smear - float X12_sm_obj; // lensing smear - float X22_sm_obj; // lensing smear - float E1_sm_obj; // lensing smear - float E2_sm_obj; // lensing smear - - float X11_sh_obj; // lensing shear - float X12_sh_obj; // lensing shear - float X22_sh_obj; // lensing shear - float E1_sh_obj; // lensing shear - float E2_sh_obj; // lensing shear - - float X11_sm_psf; // lensing smear - float X12_sm_psf; // lensing smear - float X22_sm_psf; // lensing smear - float E1_sm_psf; // lensing smear - float E2_sm_psf; // lensing smear - - float X11_sh_psf; // lensing shear - float X12_sh_psf; // lensing shear - float X22_sh_psf; // lensing shear - float E1_sh_psf; // lensing shear - float E2_sh_psf; // lensing shear - - float Mr1; // first radial moment (pixels) - float Mrh; // half radial moment (pixels^1/2) - float kronFlux; // kron flux (counts) - float kronFluxErr; // kron flux error (counts) - float kronInner; // kron flux 1