Index: /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt =================================================================== --- /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt (revision 37217) +++ /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection.txt (revision 37218) @@ -7,6 +7,6 @@ imageID - ipptopsps : expID x y (*** is this right???) (smf:IMAGEID / gpc1.chipRun.chip_image_id)_ randomDetID + ipptopsps : RANDOM from sql -dvoRegionID - dvo:average.catID -obsTime - smf:MJD-OBS + 0.5 EXPTIME / 84600 +dvoRegionID + dvo:average.catID +obsTime + smf:MJD-OBS + 0.5 EXPTIME / 84600 xPos + smf:X_PSF yPos + smf:Y_PSF @@ -16,41 +16,41 @@ posAngle + smf:POSANGLE --------------- -ra = dvo:measure.ra -dec = dvo:measure.dec -raErr = smf:X_PSF_SIG * abs(PLTSCALE) -decErr = smf:Y_PSF_SIG * abs(PLTSCALE) -zp = dvo / dvopsps : zp -telluricExt = dvo / dvopsps : zp - zpNominal (dvopsps) -expTime = dvo:measure.dt [converted to seconds] -airMass = dvo:measure.airmass +ra + dvo:measure.ra +dec + dvo:measure.dec +raErr + smf:X_PSF_SIG * abs(PLTSCALE) +decErr + smf:Y_PSF_SIG * abs(PLTSCALE) +zp + dvo / dvopsps : zp +telluricExt + dvo / dvopsps : zp - zpNominal (dvopsps) +expTime + dvo:measure.dt [converted to seconds] +airMass + dvo:measure.airmass --------------- -psfFlux = smf:PSF_INST_FLUX / EXPTIME -psfFluxErr = smf:PSF_INST_FLUX_SIG / EXPTIME -psfMajorFWHM = smf:PSF_FWHM_MAJ -psfMinorFWHM = smf:PSF_FWHM_MIN -psfTheta = smf:PSF_THETA -psfCore = smf:PSF_CORE -psfQf = smf:PSF_QF -psfQfPerfect = smf:PSF_QF_PERFECT -psfChiSq = smf:PSF_CHISQ -psfLikelihood = smf:psfLikelihood(EXT_NSIGMA) -momentXX = smf:MOMENTS_XX -momentXY = smf:MOMENTS_XY -momentYY = smf:MOMENTS_YY -momentR1 = smf:MOMENTS_R1 -momentRH = smf:MOMENTS_RH -momentM3C = smf:MOMENTS_M3C -momentM3S = smf:MOMENTS_M3S -momentM4C = smf:MOMENTS_M4C -momentM4S = smf:MOMENTS_M4S -apFlux = smf:AP_FLUX -apFluxErr = smf:AP_FLUX_SIG -apFillF = smf:AP_NPIX / (pi * (AP_MAG_RADIUS - 0.5)^2) -kronFlux = smf:KRON_FLUX -kronFluxErr = smf:KRON_FLUX_ERR -kronRad = smf:2.5*MOMENTS_R1 -sky = smf:SKY / exptime -skyErr = smf:SKY_SIGMA / exptime -infoFlag = smf:FLAGS -infoFlag2 = smf:FLAGS2 | (dvo.measure.flags << 13) -dataRelease = ippToPsps : user input (skychunk.dataRelease) +psfFlux + smf:PSF_INST_FLUX / EXPTIME +psfFluxErr + smf:PSF_INST_FLUX_SIG / EXPTIME +psfMajorFWHM + smf:PSF_FWHM_MAJ +psfMinorFWHM + smf:PSF_FWHM_MIN +psfTheta + smf:PSF_THETA +psfCore + smf:PSF_CORE +psfQf + smf:PSF_QF +psfQfPerfect + smf:PSF_QF_PERFECT +psfChiSq + smf:PSF_CHISQ +psfLikelihood + smf:psfLikelihood(EXT_NSIGMA) +momentXX + smf:MOMENTS_XX +momentXY + smf:MOMENTS_XY +momentYY + smf:MOMENTS_YY +momentR1 + smf:MOMENTS_R1 +momentRH + smf:MOMENTS_RH +momentM3C + smf:MOMENTS_M3C +momentM3S + smf:MOMENTS_M3S +momentM4C + smf:MOMENTS_M4C +momentM4S + smf:MOMENTS_M4S +apFlux + smf:AP_FLUX +apFluxErr + smf:AP_FLUX_SIG +apFillF - smf:AP_NPIX / (pi * (AP_MAG_RADIUS - 0.5)^2) +kronFlux + smf:KRON_FLUX +kronFluxErr + smf:KRON_FLUX_ERR +kronRad + smf:2.5*MOMENTS_R1 +sky + smf:SKY / exptime +skyErr + smf:SKY_SIGMA / exptime +infoFlag + smf:FLAGS +infoFlag2 + smf:FLAGS2 | (dvo.measure.flags << 13) +dataRelease + ippToPsps : user input (skychunk.dataRelease) Index: /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt =================================================================== --- /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt (revision 37217) +++ /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject.txt (revision 37218) @@ -3,5 +3,5 @@ objID + dvo / addstar -gQfPerfect - dvo / relphot / secfilt. **** this is not calculated **** +gQfPerfect + dvo / relphot / secfilt.psfQfMax gMeanPSFMag + dvo / relphot / secfilt.M gMeanPSFMagErr + dvo / relphot / secfilt.dM @@ -13,5 +13,5 @@ gMeanKronMag + dvo / relphot / secfilt.Mkron gMeanKronMagErr + dvo / relphot / secfilt.dMkron -gMeanKronMagStd - dvo / relphot / secfilt.sMkron +gMeanKronMagStd + dvo / relphot / secfilt.sMkron gMeanKronMagNpt + dvo / relphot / secfilt.NusedKron Index: /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin =================================================================== --- /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin (revision 37217) +++ /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin (revision 37218) @@ -6,4 +6,7 @@ htmID dimensionless BIGINT 8 NA HTM index zoneID dimensionless INT 4 NA Zone index +tessID dimensionless TINYINT 1 -1 ID mapping to tessellation names (eg, RINGS.V3, MD01.V3, etc) +projectionID dimensionless SMALLINT 2 -999 valid values 0 - < 10000 +skyCellID dimensionless TINYINT 1 255 valid values 0 - 143 (12x12 grid) randomID dimensionless BIGINT 8 0 Random integer between 0 and 2^32 = 4,394,967,296 remaining ramdom integer 0 batchID dimensionless BIGINT 8 -999 batch id Index: /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt =================================================================== --- /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt (revision 37217) +++ /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin.txt (revision 37218) @@ -6,20 +6,23 @@ htmID - PSPS zoneID - PSPS +tessID + average.tessID +projectionID + average.projectionID +skycellID + average.skycellID randomID + ipptopsps : RANDOM from sql batchID + ipptopsps : internal -dvoRegionID ? dvo:average.catID +dvoRegionID + dvo:average.catID dataRelease + ipptopsps : user input (skychunk.dataRelease) objInfoFlag + dvo:average.flags qualityFlag - (dvo:average.flags >> 24) & 0xFF *** correct?? consistencyFlag - *** hard-wired in ipptopsps to 0 -raStack - dvo:average.Rstk *** not calculated? -decStack - dvo:average.Dstk *** not calculated? -raStackErr - dvo:average.dRstk *** not calculated? -decStackErr - dvo:average.dDstk *** not calculated? +raStack + dvo:average.Rstk *** not calculated? +decStack + dvo:average.Dstk *** not calculated? +raStackErr + dvo:average.dRstk *** not calculated? +decStackErr + dvo:average.dDstk *** not calculated? raMean + dvo:average.R decMean + dvo:average.D -raMeanErr - dvo:average.dR -decMeanErr - dvo:average.dD -posMeanChisq - dvo:average.ChiSqAve +raMeanErr + dvo:average.dR +decMeanErr + dvo:average.dD +posMeanChisq + dvo:average.ChiSqAve ----------------- -- @@ -36,11 +39,11 @@ b - PSPS ----------------- -nStackObjectRows - *** set to 0 *** +nStackObjectRows - do in dvopsps -- -nStackDetections - not set? -nDetections - ipptopsps:Sum of ng+nr in sql -ng - dvo:secfilt.ncode ** check that this is right -nr - dvo:secfilt.ncode ** check that this is right -ni - dvo:secfilt.ncode ** check that this is right -nz - dvo:secfilt.ncode ** check that this is right -ny - dvo:secfilt.ncode ** check that this is right +nStackDetections - sum of secfilt.NstackDet (sum in sql) +nDetections + ipptopsps:Sum of ng+nr in sql +ng + dvo:secfilt.ncode ** check that this is right +nr + dvo:secfilt.ncode ** check that this is right +ni + dvo:secfilt.ncode ** check that this is right +nz + dvo:secfilt.ncode ** check that this is right +ny + dvo:secfilt.ncode ** check that this is right Index: /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin.txt =================================================================== --- /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin.txt (revision 37217) +++ /branches/eam_branches/ipp-20140717/ippToPsps/pspsschema/SchemaNew18.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObjectThin.txt (revision 37218) @@ -10,5 +10,5 @@ randomStackObjID + ipptopsps (RANDOM on sql into mysql) stackDetectRowID - set by PSPS -primaryDetection - dvo * NOT YET TESTED +primaryDetection + (dvo:measure.dbFlags >> 16) bestDetection - dvo * THIS CANNOT BE SET UNTIL LATER (after PV3 initial ingest to psps)