Index: trunk/ippToPsps/config/IN/tables.vot =================================================================== --- trunk/ippToPsps/config/IN/tables.vot (revision 34882) +++ trunk/ippToPsps/config/IN/tables.vot (revision 34884) @@ -102092,4 +102092,84 @@ + + VOTable description of PSPS table DetectionFlags + + + Name of flag + + + Flag value + + + Description of the flag + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DEFAULT0Initial value: resets all bits
PSFMODEL1Source fitted with a psf model (linear or non-linear)
EXTMODEL2Source fitted with an extended-source model
FITTED4Source fitted with non-linear model (PSF or EXT; good or bad)
FAIL8Fit (non-linear) failed (non-converge, off-edge, run to zero)
POOR16Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?)
PAIR32Source fitted with a double psf
PSFSTAR64Source used to define PSF model
SATSTAR128Source model peak is above saturation
BLEND256Source is a blend with other sources
EXTERNAL512Source based on supplied input position
BADPSF1024Failed to get good estimate of object's PSF
DEFECT2048Source is thought to be a defect
SATURATED4096Source is thought to be saturated pixels (bleed trail)
CR_LIMIT8192Source has crNsigma above limit
EXT_LIMIT16384Source has extNsigma above limit
MOMENTS_FAILURE32768could not measure the moments
SKY_FAILURE65536could not measure the local sky
SKYVAR_FAILURE131072could not measure the local sky variance
BELOW_MOMENTS_SN262144moments not measured due to low S/N
BIG_RADIUS1048576poor moments for small radius, try large radius
AP_MAGS2097152source has an aperture magnitude
BLEND_FIT4194304source was fitted as a blend
EXTENDED_FIT8388608full extended fit was used
EXTENDED_STATS16777216extended aperture stats calculated
LINEAR_FIT33554432source fitted with the linear fit
NONLINEAR_FIT67108864source fitted with the non-linear fit
RADIAL_FLUX134217728radial flux measurements calculated
SIZE_SKIPPED268435456size could not be determined
ON_SPIKE536870912peak lands on diffraction spike
ON_GHOST1073741824peak lands on ghost or glint
OFF_CHIP2147483648peak lands off edge of chip
DIFF_WITH_SINGLE4294967296diff source matched to a single positive detection
DIFF_WITH_DOUBLE8589934592diff source matched to positive detections in both images
MATCHED17179869184diff source matched to positive detections in both images
ON_SPIKE34359738368>25% of (PSF-weighted) pixels land on diffraction spike
ON_STARCORE68719476736>25% of (PSF-weighted) pixels land on starcore
ON_BURNTOOL137438953472>25% of (PSF-weighted) pixels land on burntool
ON_CONVPOOR274877906944>25% of (PSF-weighted) pixels land on convpoor
PASS1_SRC549755813888source detected in first pass analysis
HAS_BRIGHTER_NEIGHBOR1099511627776peak is not the brightest in its footprint
BRIGHT_NEIGHBOR_12199023255552flux_n / (r^2 flux_p) >1
BRIGHT_NEIGHBOR_104398046511104flux_n / (r^2 flux_p) >10
DIFF_SELF_MATCH8796093022208positive detection match is probably this source
SATSTAR_PROFILE17592186044416saturated source is modeled with a radial profile
NOCAL35184372088832detection ignored for this analysis (photcode, time range) -- internal only
POOR_PHOTOM70368744177664detection is photometry outlier
SKIP_PHOTOM140737488355328detection was ignored for photometry measurement
AREA281474976710656detection near image edge
POOR_ASTROM562949953421312detection is astrometry outlier
SKIP_ASTROM1125899906842624detection was ignored for astrometry measurement
USED_OBJ2251799813685248detection was used during update objects
USED_CHIP4503599627370496detection was used during update chips (XXX this probably does not make it into the db)
BLEND_MEAS9007199254740992detection is within radius of multiple objects
BLEND_OBJ18014398509481984multiple detections within radius of object
UNDEF_336028797018963968unused
UNDEF_472057594037927936unused
BLEND_MEAS_X144115188075855872detection is within radius of multiple objects across catalogs
ARTIFACT288230376151711744detection is thought to be non-astronomical
UNDEF_5576460752303423488unused
PHOTOM_UBERCAL1152921504606846976externally-supplied zero point from ubercal analysis
STACK_PRIMARY2305843009213693952externally-supplied zero point from ubercal analysis
STACK_PHOT_SRC4611686018427387904this measurement supplied the stack photometry
VOTable description of PSPS table DetectionFlags @@ -102109,48 +102189,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PSFMODEL1Source fitted with a psf model (linear or non-linear)
EXTMODEL2Source fitted with an extended-source model
FITTED4Source fitted with non-linear model (PSF or EXT; good or bad)
FITFAIL8Fit (non-linear) failed (non-converge, off-edge, run to zero)
POORFIT16Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?)
PAIR32Source fitted with a double psf
PSFSTAR64Source used to define PSF model
SATSTAR128Source model peak is above saturation
BLEND256Source is a blend with other sourcers
EXTERNALPOS512Source based on supplied input position
BADPSF1024Failed to get good estimate of object's PSF
DEFECT2048Source is thought to be a defect
SATURATED4096Source is thought to be saturated pixels (bleed trail)
CR_LIMIT8192Source has crNsigma above limit
EXT_LIMIT16384Source has extNsigma above limit
MOMENTS_FAILURE32768could not measure the moments
SKY_FAILURE65536could not measure the local sky
SKYVAR_FAILURE131072could not measure the local sky variance
MOMENTS_SN262144moments not measured due to low S/N
BIG_RADIUS1048576poor moments for small radius, try large radius
AP_MAGS2097152source has an aperture magnitude
BLEND_FIT4194304source was fitted as a blend
EXTENDED_FIT8388608full extended fit was used
EXTENDED_STATS16777216extended aperture stats calculated
LINEAR_FIT33554432source fitted with the linear fit
NONLINEAR_FIT67108864source fitted with the non-linear fit
RADIAL_FLUX134217728radial flux measurements calculated
SIZE_SKIPPED268435456size could not be determined
ON_SPIKE536870912peak lands on diffraction spike
ON_GHOST1073741824peak lands on ghost or glint
OFF_CHIP2147483648peak lands off edge of chip
NOCAL4294967296detection ignored for this analysis (photcode, time range) -- internal only
POOR_PHOTOM8589934592detection is photometry outlier
SKIP_PHOTOM17179869184detection was ignored for photometry measurement
MEAS_AREA34359738368detection near image edge
POOR_ASTROM68719476736detection is astrometry outlier
SKIP_ASTROM137438953472detection was ignored for astrometry measurement
USED_OBJ274877906944detection was used during opdate objects
USED_CHIP549755813888detection was used during update chips
BLEND_MEAS1099511627776detection is within radius of multiple objects
BLEND_OBJ2199023255552multiple detections within radius of object
BLEND_MEAS_X17592186044416detection is within radius of multiple objects across catalogs
ARTIFACT35184372088832detection is thought to be non-astronomical
FITTED4Source fitted with non-linear model (PSF or EXT; good or bad)
FAIL8Fit (non-linear) failed (non-converge, off-edge, run to zero)
POOR16Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?)
PAIR32Source fitted with a double psf
PSFSTAR64Source used to define PSF model
SATSTAR128Source model peak is above saturation
BLEND256Source is a blend with other sources
EXTERNAL512Source based on supplied input position
BADPSF1024Failed to get good estimate of object's PSF
DEFECT2048Source is thought to be a defect
SATURATED4096Source is thought to be saturated pixels (bleed trail)
CR_LIMIT8192Source has crNsigma above limit
EXT_LIMIT16384Source has extNsigma above limit
MOMENTS_FAILURE32768could not measure the moments
SKY_FAILURE65536could not measure the local sky
SKYVAR_FAILURE131072could not measure the local sky variance
BELOW_MOMENTS_SN262144moments not measured due to low S/N
BIG_RADIUS1048576poor moments for small radius, try large radius
AP_MAGS2097152source has an aperture magnitude
BLEND_FIT4194304source was fitted as a blend
EXTENDED_FIT8388608full extended fit was used
EXTENDED_STATS16777216extended aperture stats calculated
LINEAR_FIT33554432source fitted with the linear fit
NONLINEAR_FIT67108864source fitted with the non-linear fit
RADIAL_FLUX134217728radial flux measurements calculated
SIZE_SKIPPED268435456size could not be determined
ON_SPIKE536870912peak lands on diffraction spike
ON_GHOST1073741824peak lands on ghost or glint
OFF_CHIP2147483648peak lands off edge of chip
DIFF_WITH_SINGLE4294967296diff source matched to a single positive detection
DIFF_WITH_DOUBLE8589934592diff source matched to positive detections in both images
MATCHED17179869184diff source matched to positive detections in both images
ON_SPIKE34359738368>25% of (PSF-weighted) pixels land on diffraction spike
ON_STARCORE68719476736>25% of (PSF-weighted) pixels land on starcore
ON_BURNTOOL137438953472>25% of (PSF-weighted) pixels land on burntool
ON_CONVPOOR274877906944>25% of (PSF-weighted) pixels land on convpoor
PASS1_SRC549755813888source detected in first pass analysis
HAS_BRIGHTER_NEIGHBOR1099511627776peak is not the brightest in its footprint
BRIGHT_NEIGHBOR_12199023255552flux_n / (r^2 flux_p) >1
BRIGHT_NEIGHBOR_104398046511104flux_n / (r^2 flux_p) >10
DIFF_SELF_MATCH8796093022208positive detection match is probably this source
SATSTAR_PROFILE17592186044416saturated source is modeled with a radial profile
NOCAL35184372088832detection ignored for this analysis (photcode, time range) -- internal only
POOR_PHOTOM70368744177664detection is photometry outlier
SKIP_PHOTOM140737488355328detection was ignored for photometry measurement
AREA281474976710656detection near image edge
POOR_ASTROM562949953421312detection is astrometry outlier
SKIP_ASTROM1125899906842624detection was ignored for astrometry measurement
USED_OBJ2251799813685248detection was used during update objects
USED_CHIP4503599627370496detection was used during update chips (XXX this probably does not make it into the db)
BLEND_MEAS9007199254740992detection is within radius of multiple objects
BLEND_OBJ18014398509481984multiple detections within radius of object
UNDEF_336028797018963968unused
UNDEF_472057594037927936unused
BLEND_MEAS_X144115188075855872detection is within radius of multiple objects across catalogs
ARTIFACT288230376151711744detection is thought to be non-astronomical
UNDEF_5576460752303423488unused
PHOTOM_UBERCAL1152921504606846976externally-supplied zero point from ubercal analysis
STACK_PRIMARY2305843009213693952externally-supplied zero point from ubercal analysis
STACK_PHOT_SRC4611686018427387904this measurement supplied the stack photometry
+ + VOTable description of PSPS table ObjectInfoFlags + + + Name of flag + + + Flag value + + + Description of the flag + + + + + + + + + + + + + + + + + + +
FEW1used within relphot: skip star
POOR2used within relphot: skip star
FIT_AVE65536average position fitted
FIT_PM131072proper motion fitted
FIT_PAR262144parallax fitted
USE_AVE524288average position used (not PM or PAR)
USE_PM1048576proper motion used (not AVE or PAR)
USE_PAR2097152parallax used (not AVE or PM)
NO_ASTROM4194304mean astrometry could not be measured
EXT16777216extended in our data (eg, PS)
EXT_ALT33554432extended in external data (eg, 2MASS)
GOOD67108864good-quality measurement in our data (eg,PS)
GOOD_ALT134217728good-quality measurement in external data (eg, 2MASS)
+ + VOTable description of PSPS table ObjectInfoFlags + + + Name of flag + + + Flag value + + + Description of the flag + + + + + + + + + + + + + + + + + +
SECF_STAR_FEW1used within relphot: skip star
SECF_STAR_POOR2used within relphot: skip star
SECF_USE_SYNTH4synthetic photometry used in average measurement
SECF_USE_UBERCAL8synthetic photometry used in average measurement
SECF_HAS_PS116PS1 photometry used in average measurement
SECF_HAS_STACK32PS1 stack photometry exists
PHOTOM_PASS_0256average magnitude calculated in 0th pass
PHOTOM_PASS_1512average magnitude calculated in 1th pass
PHOTOM_PASS_21024average magnitude calculated in 2th pass
PHOTOM_PASS_32048average magnitude calculated in 3th pass
PHOTOM_PASS_44096average magnitude calculated in 4th pass
PSPS_OBJ_EXT8192extended in this band (PSPS only)
+ + VOTable description of PSPS table ObjectInfoFlags + + + Name of flag + + + Flag value + + + Description of the flag + + + + + + + + + + + + +
QF_OBJ_EXT1extended in our data (eg, PS)
QF_OBJ_EXT_ALT2extended in external data (eg, 2MASS)
QF_OBJ_GOOD4good-quality measurement in our data (eg,PS)
QF_OBJ_GOOD_ALT8good-quality measurement in external data (eg, 2MASS)
QF_OBJ_GOOD_STACK16good-quality object in the stack (> 1 good stack)
QF_OBJ_SUSPECT_STACK32suspect object in the stack (> 1 good or suspect stack, less tham 2 good)
QF_OBJ_BAD_STACK64good-quality object in the stack (> 1 good stack)
Index: trunk/ippToPsps/jython/gpc1db.py =================================================================== --- trunk/ippToPsps/jython/gpc1db.py (revision 34882) +++ trunk/ippToPsps/jython/gpc1db.py (revision 34884) @@ -61,8 +61,10 @@ JOIN rawExp USING (exp_id) \ JOIN mergedvodbRun using (minidvodb_id) \ + JOIN mergedvodbProcessed using (merge_id) \ WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \ AND minidvodbRun.state = 'merged' \ AND mergedvodbRun.state = 'full' \ AND minidvodbProcessed.fault = 0 \ + AND mergedvodbProcessed.fault = 0 \ AND addRun.stage = '" + stage + "' \ AND addRun.state = 'full' \ @@ -77,13 +79,17 @@ JOIN minidvodbRun USING(minidvodb_name) \ JOIN minidvodbProcessed USING(minidvodb_id) \ + JOIN mergedvodbRun USING(minidvodb_id) \ + JOIN mergedvodbProcessed USING (merge_id) \ JOIN stackRun USING(stack_id) JOIN skycell USING(skycell_id) \ - WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \ + WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \ AND minidvodbRun.state = 'merged' \ AND minidvodbProcessed.fault = 0 \ + AND mergedvodbRun.state = 'full' \ + AND mergedvodbProcessed.fault = 0 \ AND addRun.stage = '" + stage + "' \ AND addRun.state = 'full' \ AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \ AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) - + try: rs = self.executeQuery(sql)