Changeset 34630 for trunk/ippToPsps/jython/detectionbatch.py

Timestamp:

Oct 31, 2012, 11:54:39 AM (14 years ago)

Author:

bills

Message:

Changes to PSPS table definitions for SA 10.
Detection tables contain all fluxes
Object table contains all magnitudes
Populate DetectionCalib and StackDetectinCalib

File:

• trunk/ippToPsps/jython/detectionbatch.py (modified) (4 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -452 +452 @@
                ,MOMENTS_XY \
                ,MOMENTS_YY \
-               ,AP_MAG \
+               ,POW(10.0, -0.4 *AP_MAG) / " + self.header['EXPTIME'] + " \
                ,KRON_FLUX / " + self.header['EXPTIME'] + " \
                ,KRON_FLUX_ERR / " + self.header['EXPTIME'] + " \
@@ -458 +458 @@
                ,PSF_CHISQ \
                ,FLAGS2 << 32 | FLAGS\
-               ,SKY \
-               ,SKY_SIGMA \
+               ,SKY  / " + self.header['EXPTIME'] + " \
+               ,SKY_SIGMA  / " + self.header['EXPTIME'] + " \
                ,EXT_NSIGMA \
                , 0 \
@@ -466 +466 @@
                , " + str(self.config.dataRelease) + "\
                FROM " + ippTableName
-        # SA10 todo
-        # need to correct formulas for psfFlux/psfFluxErr
-        # need to correct apMag apFlux
-        # need to correct unites kronFlux/Err to correct units
-        # need to change psfqfperfect -> psfqfperfect PSF_QF_PERFECT?
-        # need to change psfchisq  PSF_CHI_SQ?
-        # need to change unites of sky/skyErr to adu/s/pixel
-        # need formula for sgsep/psflikelhood
         # self.logger.info(sql)
         self.scratchDb.execute(sql)
@@ -557 +549 @@
                FROM Detection_" + ota
         self.scratchDb.execute(sql)
-        #SA10 TODO
-        # insert ra/dec/calstuff into Table
-        # heather discovered dec is called 'dec_'
-        sql = "UPDATE " + tableName + " SET ra = -999, dec_ =-999, raErr = -999, decErr = -999, zp = -999, zpErr = -999, expTime = -999, airMass = -999"
+
+        # insert calibration information from dvoDetections into the Table
+        sql = "UPDATE " + tableName + " AS a, "  + self.scratchDb.dvoDetectionTable + " AS b \
+            SET a.ra = b.ra, \
+            a.dec_ = b.dec_, \
+            a.raErr = b.raErr, \
+            a.decErr = b.decErr, \
+            a.zp = b.zp, \
+            a.zpErr = b.zpErr, \
+            a.expTime = b.expTime, \
+            a.airMass = b.airMass   \
+            WHERE a.objID = b.objID AND a.detectID = b.detectID"
         self.scratchDb.execute(sql)
         self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))