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

Timestamp:

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

Author:

eugene

Message:

match forcedgal by ippObjID

File:

• trunk/ippToPsps/jython/forcedgalaxybatch.py (modified) (2 diffs)

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)