Index: /trunk/ippToPsps/config/tables.DF.vot =================================================================== --- /trunk/ippToPsps/config/tables.DF.vot (revision 38722) +++ /trunk/ippToPsps/config/tables.DF.vot (revision 38723) @@ -78,7 +78,4 @@ elements of rotation/scale matrix - - calibration modification number - Data release @@ -169,77 +166,77 @@ airmass (informational) - + PSF instrumental flux (in analog-to-digital units/sec) or adu/sec - + estimated error in flux - + model PSF width in major axis - + model PSF width in minor axis - + model PSF orientation angle degrees East of North - + model PSF core parameter [k in (1 + kz + z^1.66)] - + PSF coverage factor - + PSF-weighted fraction of pixels totally unmasked - + reduced-chisq of the psf model fit. (ndof?, npix?) - + PSF likelihood - + moment XX - + moment XY - + moment YY - + first radial moment - - half radial moment - - + + r^1/2 weighted moment + + 3rd moment cos(theta) - + 3rd moment sin(theta) - + 4th moment cos(theta) - + 4th moment sin(theta) - + Aperture Flux - + Aperture Flux error - + Aperture fill factor - + Kron flux - + Kron flux error - + Kron radius @@ -271,17 +268,17 @@ signal to noise of neg match source - + PSF sky level at source - + estimated error in sky - + flag indicating provenance information - + flag indicating provenance information - + flag indicating provenance information Index: /trunk/ippToPsps/config/tables.DO.vot =================================================================== --- /trunk/ippToPsps/config/tables.DO.vot (revision 38722) +++ /trunk/ippToPsps/config/tables.DO.vot (revision 38723) @@ -7,5 +7,5 @@ - IAU Name constructed from objID position PS1.x JHHMMSS.SS+/- + IAU Name constructed from objID position PSO JHHMMSS.SS+/- Index: /trunk/ippToPsps/config/tables.FO.vot =================================================================== --- /trunk/ippToPsps/config/tables.FO.vot (revision 38722) +++ /trunk/ippToPsps/config/tables.FO.vot (revision 38723) @@ -24,4 +24,7 @@ batch id + + data release number + number of detections in g filter @@ -111,7 +114,4 @@ flags for g forced - - second moment (Mxx+Myy) - polarization, KSB-corrected (Mxx - Myy) / (Mxx + Myy) @@ -204,10 +204,6 @@ estimated filling factor at R7 - flags for r forced - - - second moment (Mxx+Myy) @@ -304,7 +300,4 @@ flags for i forced - - second moment (Mxx+Myy) - polarization, KSB-corrected (Mxx - Myy) / (Mxx + Myy) @@ -397,11 +390,7 @@ estimated filling factor at R7 - flags for z forced - - second moment (Mxx+Myy) - polarization, KSB-corrected (Mxx - Myy) / (Mxx + Myy) @@ -496,7 +485,4 @@ flags for y forced - - - second moment (Mxx+Myy) Index: /trunk/ippToPsps/config/tables.FW.vot =================================================================== --- /trunk/ippToPsps/config/tables.FW.vot (revision 38722) +++ /trunk/ippToPsps/config/tables.FW.vot (revision 38723) @@ -99,7 +99,4 @@ elements of rotation/scale matrix - - calibration modification number - Data release @@ -164,92 +161,92 @@ airmass (informational) - + PSF instrumental flux (in analog-to-digital units/sec) or adu/sec - + estimated error in flux - + model PSF width in major axis - + model PSF width in minor axis - + model PSF orientation angles degrees East of North - + model PSF core parameter [k in (1 + kz + z^1.66)] - + PSF coverage factor - + PSF-weighted fraction of pixels totally unmasked - + reduced-chisq of the psf model fit. (ndof?, npix?) - + PSF likelihood - + moment XX - + moment XY - + moment YY - + first radial moment - + half radial moment - + 3rd moment cos(theta) - + 3rd moment sin(theta) - + 4th moment cos(theta) - + 4th moment sin(theta) - + Aperture Flux - + Aperture Flux error - + Aperture fill factor - + Kron flux - + Kron flux error - + Kron radius - + PSF sky level at source - + estimated error in sky - + flag indicating provenance information - + combination of cmf and dvo flags - + combination of cmf and dvo flags Index: /trunk/ippToPsps/config/tables.P2.vot =================================================================== --- /trunk/ippToPsps/config/tables.P2.vot (revision 38722) +++ /trunk/ippToPsps/config/tables.P2.vot (revision 38723) @@ -144,7 +144,4 @@ polynomial coefficients for the astrometric fit - - calibration modification number - batchID @@ -367,7 +364,4 @@ polynomial coefficients for the astrometric fit - - calibration modification number - Data release @@ -501,5 +495,5 @@ - half radial moment + r^1/2 weighted moment Index: /trunk/ippToPsps/config/tables.ST.vot =================================================================== --- /trunk/ippToPsps/config/tables.ST.vot (revision 38722) +++ /trunk/ippToPsps/config/tables.ST.vot (revision 38723) @@ -112,7 +112,4 @@ elements of rotation/scale matrix - - - calibration modification number @@ -521,5 +518,5 @@ - moment RH + r^1/2 weighted moment @@ -625,5 +622,5 @@ - moment RH + r^1/2 weighted moment @@ -728,5 +725,5 @@ - moment RH + r^ 1/2 weighted moment @@ -832,5 +829,5 @@ - moment RH + r^1/2 weighted moment @@ -935,5 +932,5 @@ - moment RH + r^1/2 weighted moment Index: /trunk/ippToPsps/jython/diffobjectbatch.py =================================================================== --- /trunk/ippToPsps/jython/diffobjectbatch.py (revision 38722) +++ /trunk/ippToPsps/jython/diffobjectbatch.py (revision 38723) @@ -213,5 +213,5 @@ self.logger.infoPair("updating diffObjName", "using means") ## use mean ra and dec (dec >= 0) - sql = "update DiffDetObject set diffObjName = concat('PS1.2 J', \ + sql = "update DiffDetObject set diffObjName = concat('PSO J', \ lpad(floor(ra/15.),2,'0'), \ lpad((ra/15.-(floor(ra/15.)))*60. ,2,'0'), \ @@ -230,5 +230,5 @@ ## use mean ra and dec (dec < 0) - sql = "update DiffDetObject set diffObjName = concat('PS1.2 J', \ + sql = "update DiffDetObject set diffObjName = concat('PSO J', \ lpad(floor(ra/15.),2,'0'), \ lpad((ra/15.-(floor(ra/15.)))*60. ,2,'0'), \ Index: /trunk/ippToPsps/jython/objectbatch.py =================================================================== --- /trunk/ippToPsps/jython/objectbatch.py (revision 38722) +++ /trunk/ippToPsps/jython/objectbatch.py (revision 38723) @@ -250,5 +250,5 @@ ## if we have a stackra and dec, use stackra and dec , dec >=0 - sql = "update ObjectThin set objName = concat('PS1.2 J', \ + sql = "update ObjectThin set objName = concat('PSO J', \ lpad(floor(raStack/15.),2,'0'), \ lpad((raStack/15.-(floor(raStack/15.)))*60. ,2,'0'), \ @@ -269,5 +269,5 @@ ## if we have a stackra and dec, use stackra and dec, dec < 0 - sql = "update ObjectThin set objName = concat('PS1.2 J', \ + sql = "update ObjectThin set objName = concat('PSO J', \ lpad(floor(raStack/15.),2,'0'), \ lpad((raStack/15.-(floor(raStack/15.)))*60. ,2,'0'), \ @@ -286,5 +286,5 @@ self.logger.infoPair("updating objName", "using means") ## use mean ra and dec (dec >= 0) - sql = "update ObjectThin set objName = concat('PS1.2 J', \ + sql = "update ObjectThin set objName = concat('PSO J', \ lpad(floor(raMean/15.),2,'0'), \ lpad((raMean/15.-(floor(raMean/15.)))*60. ,2,'0'), \ @@ -304,5 +304,5 @@ ## use mean ra and dec (dec < 0) - sql = "update ObjectThin set objName = concat('PS1.2 J', \ + sql = "update ObjectThin set objName = concat('PSO J', \ lpad(floor(raMean/15.),2,'0'), \ lpad((raMean/15.-(floor(raMean/15.)))*60. ,2,'0'), \