Changeset 34640

Timestamp:

Nov 1, 2012, 7:45:47 AM (14 years ago)

Author:

bills

Message:

Fix some bug in sql, shift FLAGS rom cpstable 45 bits instead of 46 to avoid overflows

File:

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

trunk/ippToPsps/jython/stackbatch.py

@@ -197 +197 @@
         sql = "UPDATE StackModelFit AS a, SkyChip_xfit AS b SET \
         "+model+"Radius=b.EXT_WIDTH_MAJ,  \
-        "+model+"Flux=POW(10, -0.4 * b.EXT_INST_MAG) " + str(self.expTime) " ,  \
-        "+model+"FluxErr=ABS(b.EXT_INST_MAG_SIG) * POW(10, -0.4 * b.EXT_INST_MAG) " + str(self.expTime) " / 1.085736, \
+        "+model+"Flux=POW(10, -0.4 * b.EXT_INST_MAG) / " + str(self.expTime) + " ,  \
+        "+model+"FluxErr=ABS(b.EXT_INST_MAG_SIG) * POW(10, -0.4 * b.EXT_INST_MAG) / " + str(self.expTime) + " / 1.085736, \
         "+model+"Ab=b.EXT_WIDTH_MAJ/b.EXT_WIDTH_MIN, \
         "+model+"Phi=b.EXT_THETA,  \
@@ -386 +386 @@
                ,MOMENTS_R1 \
                ,MOMENTS_RH \
-               ,POW(10.0, (-0.4*AP_MAG) / " + str(self.expTime) + " \
-               , NULL \
+               ,POW(10.0, -0.4*AP_MAG) / " + str(self.expTime) + " \
+               ,NULL \
                ,KRON_FLUX / " + str(self.expTime) + " \
                ,KRON_FLUX_ERR / " + str(self.expTime) + " \
@@ -476 +476 @@
         ,petRadiusErr=b.PETRO_RADIUS_ERR \
         ,petFlux=POW(10.0, -0.4 * b.PETRO_MAG) /" + str(self.expTime) + " \
-        ,petFluxErr=ABS((b.PETRO_MAG_ERR * POW(10.0, (-0.4*b.petroMag))) / " + str(self.expTime) + " / 1.085736  \
+        ,petFluxErr=ABS(b.PETRO_MAG_ERR) * POW(10.0, (-0.4*b.PETRO_MAG)) / " + str(self.expTime) + " / 1.085736  \
         ,petR50=b.PETRO_RADIUS_50 \
         ,petR50Err=b.PETRO_RADIUS_50_ERR \
@@ -616 +616 @@
         sql = "UPDATE " + tableName + " AS a, "  + self.scratchDb.dvoDetectionTable + " AS b \
             SET a.ra = b.ra, \
-            a.dec_ = b.dec_, \
+            a.dec = b.dec_, \
             a.raErr = b.raErr, \
             a.decErr = b.decErr, \
@@ -623 +623 @@
             a.expTime = b.expTime, \
             a.airMass = b.airMass   \
-            WHERE a.objID = b.objID AND a.detectID = b.detectID"
+            WHERE a.objID = b.objID AND a.ippDetectID = b.ippDetectID"
+        # XXXX: this qualifier assumes that there is only one stack being processed at a time
         self.logger.info(sql)
         self.scratchDb.execute(sql)
@@ -713 +714 @@
                a.stackDetectID = 10 * b.detectID + " + str(self.filterID) + ", \
                a.objID = b.objID, \
-               a.infoFlag = b.flags << 46 | a.infoFlag \
+               a.infoFlag = b.flags << 45 | a.infoFlag \
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.imageID = " + str(imageID)