Changeset 37219 for branches/eam_branches/ipp-20140717/ippToPsps/jython/objectbatch.py

Timestamp:

Aug 12, 2014, 12:30:55 PM (12 years ago)

Author:

eugene

Message:

add -one-batch option for testing; add nStackDetections to update ObjectThin; cleanup sql for readability; add TESS_ID, PROJECTION_ID, SKYCELL_ID

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/objectbatch.py (modified) (5 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/jython/objectbatch.py

@@ -137 +137 @@
                    " + cpsTable + " AS cps ON (cps.row = (MeanObject.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) \
                    SET \
-                    MeanObject." + filter[1] + "QfPerfect = -999 \
+                    MeanObject." + filter[1] + "QfPerfect      = PSF_QF_PERF_MAX \
                    ,MeanObject." + filter[1] + "MeanPSFMag     = MAG \
                    ,MeanObject." + filter[1] + "MeanPSFMagErr  = MAG_ERR \
@@ -192 +192 @@
 
             # XXX EAM 20140724 : this is quite awkward, add a objRow and ncode value to mysql db table?
-            sql = "UPDATE ObjectThin JOIN \
-                   " + cpsTable + " AS cps ON (cps.row = (ObjectThin.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) \
-                   SET \
-                   ObjectThin.n" + filter[1] + " = NCODE "
+            # sqlLine = sqlUtility()
+
+            sql  = "UPDATE ObjectThin JOIN "
+            sql += cpsTable + " AS cps "
+            sql += "ON (cps.row = (ObjectThin.row * "
+            sql += str(filterCount) + ")-(" 
+            sql += str(filterCount) + " - " 
+            sql += str(filter[0])
+            sql += ")) "
+
+            sql += "SET ObjectThin.n" + filter[1] + " = NCODE, "
+            sql += "ObjectThin.nStackDetections = ObjectThin.nStackDetections + cps.NSTACK_DET"
             self.logger.info(sql)
             self.scratchDb.execute(sql)
@@ -203 +211 @@
         for filter in filters:
             # now do a sum of n[filters], but do not include the ones with -999
-            sql = "UPDATE ObjectThin   \
-                   SET nDetections = nDetections + n" + filter[1] + " \
-                   WHERE n" + filter[1] + " != -999"
+            sql  = "UPDATE ObjectThin "
+            sql += "SET nDetections = nDetections + n" + filter[1]
+            sql += " WHERE n" + filter[1] + " != -999"
             self.scratchDb.execute(sql)
 
@@ -329 +337 @@
         sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
         sqlLine.group("dvoRegionID",     "CAT_ID") 
+        sqlLine.group("tessID",          "TESS_ID") 
+        sqlLine.group("projectionID",    "PROJECTION_ID") 
+        sqlLine.group("skycellID",       "SKYCELL_ID") 
         sqlLine.group("dataRelease",     "'" + str(self.skychunk.dataRelease) + "'")
         sqlLine.group("objInfoFlag",     "FLAGS") 
@@ -428 +439 @@
         self.logger.infoPair("Populating MeanObject from ", "ObjectThin")
 
-        sql = "INSERT INTO MeanObject ( \
-               objID \
-               ,gcobjID \
-               ) \
-               SELECT \
-               objID \
-               ,gcobjID \
-               FROM ObjectThin"
+        sql = "INSERT INTO MeanObject ( objID ) SELECT objID FROM ObjectThin"
         try:
             self.scratchDb.execute(sql)