Index: branches/eam_branches/ipp-20120627/ippToPsps/config/OB/tables.vot
===================================================================
--- branches/eam_branches/ipp-20120627/ippToPsps/config/OB/tables.vot (revision 34139)
+++ branches/eam_branches/ipp-20120627/ippToPsps/config/OB/tables.vot (revision 34241)
@@ -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: branches/eam_branches/ipp-20120627/ippToPsps/jython/objectbatch.py
===================================================================
--- branches/eam_branches/ipp-20120627/ippToPsps/jython/objectbatch.py (revision 34139)
+++ branches/eam_branches/ipp-20120627/ippToPsps/jython/objectbatch.py (revision 34241)
@@ -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)
@@ -167,5 +166,5 @@
cpsTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cps")
- self.logger.infoPair("Populating", "ObjectCalColor")
+ self.logger.infoPair("Populating", "Object")
self.logger.infoPair("Inserting objects from", "cpt file")
@@ -203,5 +202,5 @@
self.logger.errorPair("Couldn't populate Object table", sql)
return False
-
+
# add row count columns so we can perform joins to get colors
self.logger.infoPair("Adding 'row' columns to", "Object and cps tables")
@@ -211,9 +210,44 @@
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
+
+ self.logger.infoPair("Determining", "ra/dec range")
+
+ raMin = self.scratchDb.getFromdvoSkyTable("R_MIN",self.region)
+ raMax = self.scratchDb.getFromdvoSkyTable("R_MAX",self.region)
+ decMin = self.scratchDb.getFromdvoSkyTable("D_MIN",self.region)
+ decMax = self.scratchDb.getFromdvoSkyTable("D_MAX",self.region)
+
+ self.logger.infoPair("R_MIN", raMin)
+ self.logger.infoPair("R_MAX", raMax)
+ self.logger.infoPair("D_MIN", decMin)
+ self.logger.infoPair("D_MAX", decMax)
+ #count out of range
+
+ sql = "SELECT count(*) FROM Object where Object.dec > " + str(decMax) + " or Object.dec < " + str(decMin) + " or Object.ra > " + str(raMax) + " or Object.ra < " + str(raMin)
+
+ rs = self.scratchDb.executeQuery(sql)
+ rs.first()
+ nToDelete = rs.getInt(1)
+
+ #delete out of range
+
+
+ sql = "DELETE FROM Object where Object.dec > " + str(decMax) + " or Object.dec < " + str(decMin) + " or Object.ra > " + str(raMax) + " or Object.ra < " + str(raMin)
+ self.logger.infoPair("Deleting", str(nToDelete) + " objects outside of ra/dec range")
+
+ try:
+ self.scratchDb.execute(sql)
+ except:
+ self.logger.errorPair("Couldn't cull outsiders from Object table", sql)
+ return False
self.logger.infoPair("Dropping row column from", "Object table")
self.scratchDb.dropColumn("Object", "row")
self.logger.infoPair("Purging from scratch Db", self.region + " region")
+
self.dvoObjects.purgeRegion(self.region)
Index: branches/eam_branches/ipp-20120627/ippToPsps/jython/plot.py
===================================================================
--- branches/eam_branches/ipp-20120627/ippToPsps/jython/plot.py (revision 34139)
+++ branches/eam_branches/ipp-20120627/ippToPsps/jython/plot.py (revision 34241)
@@ -40,5 +40,5 @@
OUTPUTFILE = self.config.name + "_" + batchType + "_" + timestamp + ".png"
- f = os.popen('gnuplot', 'w')
+ f = os.popen('/home/panstarrs/ipp/local/bin/gnuplot', 'w')
if 0:
Index: branches/eam_branches/ipp-20120627/ippToPsps/jython/scratchdb.py
===================================================================
--- branches/eam_branches/ipp-20120627/ippToPsps/jython/scratchdb.py (revision 34139)
+++ branches/eam_branches/ipp-20120627/ippToPsps/jython/scratchdb.py (revision 34241)
@@ -593,2 +593,37 @@
return orderedFilters
+
+ def getRaDecRangesFromdvoSkyTable(self, name):
+
+ sql = "SELECT R_MIN, R_MAX, D_MIN, D_MAX FROM dvoSkyTable WHERE NAME = '" + name + "' limit 1"
+ try:
+ rs = self.executeQuery(sql)
+ rs.first()
+ raMin = rs.getFloat(1)
+ raMax = rs.getFloat(2)
+ decMin = rs.getFloat(3)
+ decMax = rs.getFloat(4)
+
+ except:
+ self.logger.errorPair("no ra/decs found for", name)
+ raMin = -999
+ raMax = -999
+ decMin = -999
+ decMax = -999
+
+ return raMin, raMax, decMin, decMax
+
+ def getFromdvoSkyTable(self, column, name):
+
+ sql = "SELECT "+column + " FROM dvoSkyTable WHERE NAME = '" + name + "' limit 1"
+ try:
+ rs = self.executeQuery(sql)
+ rs.first()
+ res = rs.getDouble(1)
+
+ except:
+ self.logger.errorPair("no ra/decs found for", name)
+ res = -999
+
+
+ return res
Index: branches/eam_branches/ipp-20120627/ippToPsps/jython/stackbatch.py
===================================================================
--- branches/eam_branches/ipp-20120627/ippToPsps/jython/stackbatch.py (revision 34139)
+++ branches/eam_branches/ipp-20120627/ippToPsps/jython/stackbatch.py (revision 34241)
@@ -397,4 +397,9 @@
self.scratchDb.execute(sql)
+ #it is possible to drop some detections from dvo (that are present in the cmf). when that happens we get a 0 for objid
+ #we drop those...
+ sql="DELETE FROM StackDetection where objID = 0"
+ self.scratchDb.execute(sql)
+ self.logger.infoPair("Deleting", "entries with StackDetection.objID = 0")
self.scratchDb.updateAllRows("StackDetection", "surveyID", str(self.surveyID))
@@ -421,4 +426,7 @@
self.scratchDb.reportAndDeleteRowsWithNULLS("StackDetection", "instFlux")
self.scratchDb.reportAndDeleteRowsWithNULLS("StackDetection", "objID")
+ sql="DELETE FROM StackDetection where objID = 0"
+ self.scratchDb.execute(sql)
+ self.logger.infoPair("Deleting", "entries with StackDetection.objID = 0")