Changeset 38152 for branches/eam_branches/ipp-20150405/ippToPsps/jython/forcedobjectbatch.py

Timestamp:

Apr 18, 2015, 6:27:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk (updates for pstamp, remote tools, ippToPsps schema 20)

Location:

branches/eam_branches/ipp-20150405

Files:

• . (modified) (1 prop)
• ippToPsps/jython/forcedobjectbatch.py (modified) (2 diffs)

branches/eam_branches/ipp-20150405/ippToPsps/jython/forcedobjectbatch.py

@@ -328 +328 @@
         sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
         sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
+        sqlLine.group("randomForcedObjID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)")
         sqlLine.group("nDetections",      "'0'")
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + cptTableName)
@@ -354 +355 @@
         sqlLine.group("objID",           "objID")
         sqlLine.group("uniquePspsFOid","uniquePspsFOid")
+        sqlLine.group("randomForcedObjID","randomForcedObjID")
         sqlLine.group("ippObjID",        "ippObjID")
         sqlLine.group("batchID",         "batchID")
         sqlLine.group("nDetections",      "nDetections")
-        sqlLine.group("gStackID",      "gStackID")
-        sqlLine.group("rStackID",      "rStackID")
-        sqlLine.group("iStackID",      "iStackID")
-        sqlLine.group("zStackID",      "zStackID")
-        sqlLine.group("yStackID",      "yStackID")
 
         sql = sqlLine.makeRaw(") SELECT ", " FROM ForcedMeanObject")