Changeset 39075 for trunk

Timestamp:

Nov 8, 2015, 5:25:30 AM (11 years ago)

Author:

eugene

Message:

match forcedgal by ippObjID

Location:

trunk/ippToPsps/jython

Files:

• diffobjectbatch.py (modified) (1 diff)
• forcedgalaxybatch.py (modified) (2 diffs)
• objectbatch.py (modified) (1 diff)

trunk/ippToPsps/jython/diffobjectbatch.py

@@ -310 +310 @@
         sqlLine = sqlUtility("INSERT INTO DiffDetObject (")
 
-        sqlLine.group("diffObjID",           "EXT_ID") 
-        sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
-        sqlLine.group("surveyID",        "'" + str(self.surveyID) + "'")
-        sqlLine.group("randomDiffObjID",        "RAND("+str(self.batchID)+")") # XXX where does this number come from??
-        sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
-        sqlLine.group("dvoRegionID",     "CAT_ID") 
-#        sqlLine.group("skycellID",       "SKYCELL_ID") 
-        sqlLine.group("processingVersion",     "'" + str(self.skychunk.processingVersion) + "'")
-        sqlLine.group("objInfoFlag",     "FLAGS") 
-        sqlLine.group("qualityFlag",     "FLAGS >> 24 & 0xFF")
-        sqlLine.group("ra",          "RA_MEAN")
-        sqlLine.group("dec_",         "DEC_MEAN")
-        sqlLine.group("nDetections",      "'0'")
+        sqlLine.group("diffObjID",         "EXT_ID") 
+        sqlLine.group("ippObjID",          "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
+        sqlLine.group("surveyID",          "'" + str(self.surveyID) + "'")
+        sqlLine.group("randomDiffObjID",   "RAND("+str(self.batchID)+")") # XXX where does this number come from??
+        sqlLine.group("batchID",           "'" + str(self.batchID) + "'")
+        sqlLine.group("dvoRegionID",       "CAT_ID") 
+#        sqlLine.group("skycellID",        "SKYCELL_ID") 
+        sqlLine.group("processingVersion", "'" + str(self.skychunk.processingVersion) + "'")
+        sqlLine.group("objInfoFlag",       "FLAGS") 
+        sqlLine.group("qualityFlag",       "FLAGS >> 24 & 0xFF")
+        sqlLine.group("ra",                "RA_MEAN")
+        sqlLine.group("dec_",              "DEC_MEAN")
+        sqlLine.group("nDetections",       "'0'")
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)
 

trunk/ippToPsps/jython/forcedgalaxybatch.py

@@ -168 +168 @@
             # sqlLine.group("a." + filter[1] + "GalDecErr",       "b.DEC_ERR")
 
-            sql = sqlLine.makeEquals("WHERE a.objID = b.OBJ_ID AND a.galModelType = b.MODEL_TYPE AND b.Photcode = " + str(photcode))
+            sql = sqlLine.makeEquals("WHERE a.ippObjID = (b.OBJ_ID + (b.CAT_ID << 32)) AND a.galModelType = b.MODEL_TYPE AND b.Photcode = " + str(photcode))
+
+            self.logger.debugPair("cpq sql: ", sql)
 
             self.scratchDb.execute(sql)
@@ -195 +197 @@
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)
 
+        print "--- sql: " + sql
+
         self.scratchDb.execute(sql)
 

trunk/ippToPsps/jython/objectbatch.py

@@ -230 +230 @@
                 self.logger.InfoPair("failed sql",sql)
                 raise
+
         # XXX this does not seem like a good thing to leave in SQL
         self.logger.infoPair("Calculating nDetections from", "n[filters]")