Changeset 39075 for trunk/ippToPsps/jython/diffobjectbatch.py

Timestamp:

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

Author:

eugene

Message:

match forcedgal by ippObjID

File:

• trunk/ippToPsps/jython/diffobjectbatch.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)