Index: trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c =================================================================== --- trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c (revision 39250) +++ trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c (revision 39251) @@ -148,12 +148,18 @@ "FLUX_PSF_WRP_ERR FLOAT, " "FLUX_PSF_WRP_STDEV FLOAT, " - + "MAG_PSF_WRP FLOAT, " + "MAG_PSF_WRP_ERR FLOAT, " + "FLUX_KRON_WRP FLOAT, " "FLUX_KRON_WRP_ERR FLOAT, " "FLUX_KRON_WRP_STDEV FLOAT, " - + "MAG_KRON_WRP FLOAT, " + "MAG_KRON_WRP_ERR FLOAT, " + "FLUX_AP_WRP FLOAT, " "FLUX_AP_WRP_ERR FLOAT, " - "FLUX_AP_WRP_STDEV FLOAT, " + "FLUX_AP_WRP_STDEV FLOAT, " + "MAG_AP_WRP FLOAT, " + "MAG_AP_WRP_ERR FLOAT, " "FLAGS INT " @@ -188,4 +194,6 @@ "FLUX_STD_AP_R5 FLOAT, " "FLUX_FIL_AP_R5 FLOAT, " + "MAG_AP_R5 FLOAT, " + "MAG_ERR_AP_R5 FLOAT, " "FLUX_AP_R6 FLOAT, " @@ -193,4 +201,6 @@ "FLUX_STD_AP_R6 FLOAT, " "FLUX_FIL_AP_R6 FLOAT, " + "MAG_AP_R6 FLOAT, " + "MAG_ERR_AP_R6 FLOAT, " "FLUX_AP_R7 FLOAT, " @@ -198,4 +208,6 @@ "FLUX_STD_AP_R7 FLOAT, " "FLUX_FIL_AP_R7 FLOAT, " + "MAG_AP_R7 FLOAT, " + "MAG_ERR_AP_R7 FLOAT, " "X11_SM_OBJ FLOAT, " @@ -262,13 +274,19 @@ "FLUX_PSF_WRP, " "FLUX_PSF_WRP_ERR, " - "FLUX_PSF_WRP_STDEV, " + "FLUX_PSF_WRP_STDEV, " + "MAG_PSF_WRP, " + "MAG_PSF_WRP_ERR, " "FLUX_KRON_WRP, " "FLUX_KRON_WRP_ERR, " - "FLUX_KRON_WRP_STDEV, " + "FLUX_KRON_WRP_STDEV, " + "MAG_KRON_WRP, " + "MAG_KRON_WRP_ERR, " "FLUX_AP_WRP, " "FLUX_AP_WRP_ERR, " - "FLUX_AP_WRP_STDEV, " + "FLUX_AP_WRP_STDEV, " + "MAG_AP_WRP, " + "MAG_AP_WRP_ERR, " "FLAGS" @@ -287,4 +305,6 @@ "FLUX_STD_AP_R5, " "FLUX_FIL_AP_R5, " + "MAG_AP_R5, " + "MAG_ERR_AP_R5, " "FLUX_AP_R6, " @@ -292,4 +312,6 @@ "FLUX_STD_AP_R6, " "FLUX_FIL_AP_R6, " + "MAG_AP_R6, " + "MAG_ERR_AP_R6, " "FLUX_AP_R7, " @@ -297,4 +319,6 @@ "FLUX_STD_AP_R7, " "FLUX_FIL_AP_R7, " + "MAG_AP_R7, " + "MAG_ERR_AP_R7, " "X11_SM_OBJ, " @@ -348,8 +372,14 @@ float meanPSFFluxErr = NAN; float meanPSFFluxStd = NAN; + float meanPSFMag = NAN; + float meanPSFMagErr = NAN; if (isfinite(secfilt->dFpsfWrp) && isfinite(secfilt->FpsfWrp)) { meanPSFFlux = secfilt-> FpsfWrp; meanPSFFluxErr = secfilt->dFpsfWrp; meanPSFFluxStd = secfilt->sFpsfWrp; + if (meanPSFFlux > 0.0) { + meanPSFMag = -2.5 * log10(meanPSFFlux / 3631.0); + meanPSFMagErr = (2.5 * meanPSFFluxErr) / (meanPSFFlux * log(10)); + } } @@ -357,8 +387,14 @@ float meanKronFluxErr = NAN; float meanKronFluxStd = NAN; + float meanKronMag = NAN; + float meanKronMagErr = NAN; if (isfinite(secfilt->dFkronWrp) && isfinite(secfilt->FkronWrp)) { meanKronFlux = secfilt-> FkronWrp; meanKronFluxErr = secfilt->dFkronWrp; meanKronFluxStd = secfilt->sFkronWrp; + if (meanKronFlux > 0.0) { + meanKronMag = -2.5 * log10(meanKronFlux / 3631.0); + meanKronMagErr = (2.5 * meanKronFluxErr) / (meanKronFlux * log(10)); + } } @@ -366,8 +402,14 @@ float meanApFluxErr = NAN; float meanApFluxStd = NAN; + float meanApMag = NAN; + float meanApMagErr = NAN; if (isfinite(secfilt->dFapWrp) && isfinite(secfilt->FapWrp)) { meanApFlux = secfilt-> FapWrp; meanApFluxErr = secfilt->dFapWrp; meanApFluxStd = secfilt->sFapWrp; + if (meanApFlux > 0.0) { + meanApMag = -2.5 * log10(meanApFlux / 3631.0); + meanApMagErr = (2.5 * meanApFluxErr) / (meanApFlux * log(10)); + } } @@ -382,12 +424,18 @@ PRINT_FLOAT(sec_buffer, meanPSFFluxErr, "%.6e, "); // uflux precision PRINT_FLOAT(sec_buffer, meanPSFFluxStd, "%.6e, "); // uflux precision - + PRINT_FLOAT(sec_buffer, meanPSFMag, "%.6f, "); + PRINT_FLOAT(sec_buffer, meanPSFMagErr, "%.6f, "); + PRINT_FLOAT(sec_buffer, meanKronFlux, "%.6e, "); // uflux precision PRINT_FLOAT(sec_buffer, meanKronFluxErr, "%.6e, "); // uflux precision PRINT_FLOAT(sec_buffer, meanKronFluxStd, "%.6e, "); // uflux precision + PRINT_FLOAT(sec_buffer, meanKronMag, "%.6f, "); + PRINT_FLOAT(sec_buffer, meanKronMagErr, "%.6f, "); PRINT_FLOAT(sec_buffer, meanApFlux, "%.6e, "); // uflux precision PRINT_FLOAT(sec_buffer, meanApFluxErr, "%.6e, "); // uflux precision PRINT_FLOAT(sec_buffer, meanApFluxStd, "%.6e, "); // uflux precision + PRINT_FLOAT(sec_buffer, meanApMag, "%.6f, "); + PRINT_FLOAT(sec_buffer, meanApMagErr, "%.6f, "); PrintIOBuffer (sec_buffer, "%u ", secfilt->flags); @@ -402,16 +450,42 @@ PrintIOBuffer (cpy_buffer, "%hd, ", lensobj->photcode); + float magApR5 = NAN; + float magErrApR5 = NAN; + float magApR6 = NAN; + float magErrApR6 = NAN; + float magApR7 = NAN; + float magErrApR7 = NAN; + + if (lensobj->F_ApR5 > 0.0) { + magApR5 = -2.5 * log10(lensobj->F_ApR5 / 3631.0); + magErrApR5 = (2.5 * lensobj->dF_ApR5) / (lensobj->F_ApR5 * log(10)); + } + if (lensobj->F_ApR6 > 0.0) { + magApR6 = -2.5 * log10(lensobj->F_ApR6 / 3631.0); + magErrApR6 = (2.5 * lensobj->dF_ApR6) / (lensobj->F_ApR6 * log(10)); + } + if (lensobj->F_ApR7 > 0.0) { + magApR7 = -2.5 * log10(lensobj->F_ApR7 / 3631.0); + magErrApR7 = (2.5 * lensobj->dF_ApR7) / (lensobj->F_ApR7 * log(10)); + } + PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR5, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR5, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR5, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR5, "%.6e, "); + PRINT_FLOAT(cpy_buffer, magApR5, "%.6f, "); + PRINT_FLOAT(cpy_buffer, magErrApR5, "%.6f, "); PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR6, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR6, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR6, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR6, "%.6e, "); + PRINT_FLOAT(cpy_buffer, magApR6, "%.6f, "); + PRINT_FLOAT(cpy_buffer, magErrApR6, "%.6f, "); PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR7, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR7, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR7, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR7, "%.6e, "); + PRINT_FLOAT(cpy_buffer, magApR7, "%.6f, "); + PRINT_FLOAT(cpy_buffer, magErrApR7, "%.6f, "); PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_obj, "%.6e, "); PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_obj, "%.6e, ");