Index: trunk/ippToPsps/config/OB/tables.vot
===================================================================
--- trunk/ippToPsps/config/OB/tables.vot (revision 34215)
+++ trunk/ippToPsps/config/OB/tables.vot (revision 34217)
@@ -75,207 +75,207 @@
total number of detection measurements in all filters
-
- mean RA of object
-
-
- mean DEC of object
-
-
- estimated error in raMean
-
-
- estimated error in decMean
+
+ estimated error in g stack psf flux
+
+
+ estimated error in r stack psf flux
+
+
+ estimated error in i stack psf flux
+
+
+ estimated error in z stack psf flux
number of measures in g filter
-
- mean g magnitude
-
-
- mean g flux
-
-
- estimated error of g magnitude mean
-
-
- estimated error of g flux mean
-
-
- minimum g magnitide
-
-
- maximum g magnitude
+
+ mean g psf magnitude
+
+
+ mean g kron mag
+
+
+ estimated error of g psf magnitude mean
+
+
+ estimated error of g kron mean mag
+
+
+ 20 pct g magnitude
+
+
+ 80 pct g magnitude
number of measures in r filter
-
- mean r magnitude
-
-
- mean r flux
-
-
- estimated error of r magnitude mean
-
-
- estimated error of r flux mean
-
-
- minimum r magnitude
-
-
- maximum r magnitude
+
+ mean r psf magnitude
+
+
+ mean r kron mag
+
+
+ estimated error of r psf magnitude mean
+
+
+ estimated error of r mean kron mag
+
+
+ 20 pct r magnitude
+
+
+ 80 pct r magnitude
number of measures in i filter
-
- mean i magnitude
-
-
- mean i flux
-
-
- estimated error of i magitude mean
-
-
- estimated error of i flux mean
-
-
- minimum i magniutde
-
-
- maximum i magnitude
+
+ mean psf i magnitude
+
+
+ mean i kron mag
+
+
+ estimated error of i psf magitude mean
+
+
+ estimated error of i kron mag mean
+
+
+ 20 pct i magniutde
+
+
+ 80 pct i magnitude
number of measures in z filter
-
- mean z magnitude
-
-
- mean z flux
-
-
- estimated error of z magnitude mean
-
-
- estimated error of z flux mean
-
-
- minimum z magnitude
-
-
- maximum z magnitude
+
+ mean z psf magnitude
+
+
+ mean z kron mag
+
+
+ estimated error of z psf magnitude mean
+
+
+ estimated error of z mean kron mag
+
+
+ 20 pct z magnitude
+
+
+ 80 pct z magnitude
number of measures in y filter
-
- mean y magnitude
-
-
- mean y flux
-
-
- estimated error of y magnitude mean
-
-
- estimated error of y flux mean
-
-
- minimum y magnitude
-
-
- maximum y magnitude
+
+ mean y psf magnitude
+
+
+ mean y kron mag
+
+
+ estimated error of y psf magnitude mean
+
+
+ estimated error of y kron mag mean
+
+
+ 20 pct y magnitude
+
+
+ 80 pct y magnitude
number of measures in the wide (w) solar system filter
-
- mean w magnitude
-
-
- mean w flux
-
-
- estimated error of w magnitude mean
-
-
- estimated error of w flux mean
-
-
- minimum w magnitude
-
-
- maximum w magnitude
-
-
- g-r color from gMean & rMean
-
-
- r-i color from rMean & iMean
-
-
- i-z color from iMean & zMean
-
-
- z-y color from zMean & yMean
-
-
- Estimated error in g-r color from gMean & rMean
-
-
- Estimated error in r-i color from rMean & iMean
-
-
- Estimated error in i-z color from iMean & zMean
-
-
- Estimated error in z-y color from zMean & yMean
-
-
- g magnitude from stack frames
-
-
- index of which g model magnitude was used from stack
-
-
- r magnitude from stack frames
-
-
- index of which r model magnitude was used from stack
-
-
- i magnitude from stack frames
-
-
- index of which i model magnitude was used from stack
-
-
- z magnitude from stack frames
-
-
- index of which z model magnitude was used from stack
-
-
- y magnitude from stack frames
-
-
- index of which y model magnitude was used from stack
-
-
- g-r color from gmag and rmag
-
-
- r-i color from rmag and imag
-
-
- i-z color from imag and zmag
-
-
- z-y color from zmag and ymag
+
+ mean w psf magnitude
+
+
+ mean w kron mag
+
+
+ estimated error of w psf magnitude mean
+
+
+ estimated error of w kron mag mean
+
+
+ 20 pct w magnitude
+
+
+ 80 pct w magnitude
+
+
+ g stack psf flux
+
+
+ r stack psf flux
+
+
+ i stack psf flux
+
+
+ z stack psf flux
+
+
+ error from g stack kron mag
+
+
+ error from r stack kron mag
+
+
+ error from i stack kron mag
+
+
+ error from z stack kron mag
+
+
+ g kron magnitude from stack frames
+
+
+ flags for g stack
+
+
+ r kron magnitude from stack frames
+
+
+ flags for r stack
+
+
+ i kron magnitude from stack frames
+
+
+ flags for i stack
+
+
+ z kron magnitude from stack frames
+
+
+ flags for z stack
+
+
+ y kron magnitude from stack frames
+
+
+ flags for y stack
+
+
+ y band stack PSF flux
+
+
+ y band stack kron mag err
+
+
+ y band stack psf flux err
+
+
+ currently unused
Index: trunk/ippToPsps/jython/objectbatch.py
===================================================================
--- trunk/ippToPsps/jython/objectbatch.py (revision 34215)
+++ trunk/ippToPsps/jython/objectbatch.py (revision 34217)
@@ -118,9 +118,8 @@
SET \
n" + filter[1] + " = NCODE \
- ," + filter[1] + "MeanMag = MAG \
- ," + filter[1] + "MeanFlux = 3631 * POW(10.0, (-0.4*MAG)) \
- ," + filter[1] + "MeanMagErr = MAG_ERR \
- ," + filter[1] + "Min = MAG_20/1000 \
- ," + filter[1] + "Max = MAG_80/1000 \
+ ," + filter[1] + "MeanPSFMag = MAG \
+ ," + filter[1] + "MeanPSFMagErr = MAG_ERR \
+ ," + filter[1] + "20pct = MAG_20/1000 \
+ ," + filter[1] + "80pct = MAG_80/1000 \
"
@@ -133,6 +132,6 @@
sql = "UPDATE Object \
- SET " + filter[1] + "MeanMagErr = null \
- WHERE " + filter[1] + "MeanMagErr > " + str(cut)
+ SET " + filter[1] + "MeanPSFMagErr = null \
+ WHERE " + filter[1] + "MeanPSFMagErr > " + str(cut)
self.scratchDb.execute(sql)
@@ -211,5 +210,6 @@
self.insertMags(cpsTableName)
- self.updateColors()
+#don't do this as we removed those columns..
+# self.updateColors()
#objects can have out of range ra dec in dvo - need to find and kill them at the end