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

Timestamp:

May 12, 2014, 5:37:01 PM (12 years ago)

Author:

heather

Message:

Ipptopsps: new Schema, old dvo - first attempt to run sas

File:

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

trunk/ippToPsps/jython/detectionbatch.py

@@ -410 +410 @@
         sql = "INSERT IGNORE INTO " + pspsTableName + " ( \
                ippDetectID \
+               ,randomDetID \
                ,filterID \
                ,surveyID \
@@ -442 +443 @@
                ,sky \
                ,skyErr \
+               ,pltScale \
+               ,posAngle \
                ,dataRelease \
                ) \
                SELECT \
                IPP_IDET \
+               , FLOOR(RAND()*9223372036854775807) \
                , " + str(self.filterID) + "\
                , " + str(self.surveyID) + " \
@@ -464 +468 @@
                ,MOMENTS_XY \
                ,MOMENTS_YY \
-               ,-999 \
-               ,-999 \
-               ,-999 \
-               ,-999 \
-               ,-999 \
-               ,-999 \
+               ,MOMENTS_R1 \
+               ,MOMENTS_RH \
+               ,MOMENTS_M3C \
+               ,MOMENTS_M3S \
+               ,MOMENTS_M4C \
+               ,MOMENTS_M4S \
                ,POW(10.0, -0.4 *AP_MAG) / " + self.header['EXPTIME'] + " \
                ,KRON_FLUX / " + self.header['EXPTIME'] + " \
@@ -478 +482 @@
                ,SKY  / " + self.header['EXPTIME'] + " \
                ,SKY_SIGMA  / " + self.header['EXPTIME'] + " \
+               ,PLTSCALE \
+               ,POSANGLE \
                , " + str(self.skychunk.dataRelease) + "\
                FROM " + ippTableName
@@ -932 +938 @@
         sql = "UPDATE FrameMeta SET nOTA = %d, numPhotoRef = %d" % (otaCount, self.totalNumPhotoRef)
         self.scratchDb.execute(sql)
+        #to make it stop
+        #test = self.scratchDb.getRowCount("Object")
+        #return False
         
         return True
@@ -1011 +1020 @@
 
        # XXX EAM NOTE : this is fragile : requires PS1_V4
-       columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PSF_INST_FLUX PSF_INST_FLUX_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG KRON_FLUX KRON_FLUX_ERR FLAGS FLAGS2 SKY SKY_SIGMA EXT_NSIGMA PSF_QF_PERFECT PSF_CHISQ"
+       columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PSF_INST_FLUX PSF_INST_FLUX_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY MOMENTS_R1 MOMENTS_RH MOMENTS_M3C MOMENTS_M3S MOMENTS_M4C MOMENTS_M4S AP_MAG KRON_FLUX KRON_FLUX_ERR FLAGS FLAGS2 SKY SKY_SIGMA EXT_NSIGMA PSF_QF_PERFECT PSF_CHISQ POSANGLE PLTSCALE"
 
        return super(DetectionBatch, self).importIppTables(columns, regex)