Changeset 38052 for branches/eam_branches/ipp-20150112/ippToPsps/jython/detectionbatch.py

Timestamp:

Mar 28, 2015, 8:28:32 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20150112/ippToPsps/jython/detectionbatch.py (modified) (4 diffs)

branches/eam_branches/ipp-20150112/ippToPsps/jython/detectionbatch.py

@@ -401 +401 @@
         # XXX EAM 2014072 : Is this still a problem?
         sql = "UPDATE " + pspsTableName + " SET psfFlux = 1e20 WHERE psfFlux <= 0.0"
-        self.scratchDb.execute(sql)
-        
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.infoPair("failed sql",sql)
+            raise
         sql = "UPDATE " + pspsTableName + " SET apFlux = 1e20 WHERE apFlux <= 0.0"
-        self.scratchDb.execute(sql)
-
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.infoPair("failed sql",sql)
+            raise
         sql = "UPDATE " + pspsTableName + " SET kronFlux = 1e20 WHERE kronFlux <= 0.0"
-        self.scratchDb.execute(sql)
-
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.infoPair("failed sql",sql)
+            raise
         # we don't delete these anymore
         results['NULLINSTFLUX'] = 0;
@@ -604 +610 @@
                AND b.imageID = " + str(imageID)
 
-        self.scratchDb.execute(sql)
-
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.InfoPair("failed sql",sql)
+            raise
     '''
     Updates table and generates pspsuniqueids
@@ -611 +619 @@
 
     def updatePspsUniqueIDs(self,table, ota):
-        sql = "UPDATE "+table+" join (select @r:=@r+1 rownum, objID from \
-        (select @r:=0) r, "+table+" t) as foo using (objID) set \
-        uniquePspsP2id = ((" +str(self.batchID)+ "*1000000000 ) \
-        + (" +str(ota) + "*10000000  )+rownum)"
+        #sql = "UPDATE "+table+" join (select @r:=@r+1 rownum, objID from \
+        #(select @r:=0) r, "+table+" t) as foo using (objID) set \
+        #uniquePspsP2id = ((" +str(self.batchID)+ "*1000000000 ) \
+        #+ (" +str(ota) + "*10000000  )+rownum)"
+        sql = "UPDATE "+table+" set uniquePspsP2id = (("+str(self.batchID)+"*1000000000 ) + (" +str(ota) + "*10000000  )+ row)"
         try: self.scratchDb.execute(sql)
         except:
@@ -647 +656 @@
         #self.logger.info("successful populate ");
         # now add DVO IDs
+        self.logger.infoPair("Adding 'row' column to ", "Detection_"+chipname)
+        #detection has a primary index, so don't add, use this one
+        self.scratchDb.addRowCountColumnNoKey("Detection_"+chipname, "row")
         self.updateDvoIDs("Detection_" + chipname, self.imageIDs[chipname])
         #self.logger.info("updated dvoids")
         results['NULLOBJID'] = self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + chipname, "objID")
         #self.logger.info("deleted nulls")
+
+        ota = x*10+y
+
+
         self.logger.info("add psps unique p2 ids")
-        ota = x*10+y
         self.updatePspsUniqueIDs("Detection_" + chipname, ota)
+        self.logger.infoPair("Dropping 'row' column from ", "Detection_"+chipname)
+        self.scratchDb.dropColumn("Detection_"+chipname,"row")
         self.updateImageID("Detection_" + chipname, x, y)
         #self.logger.info("updateImageId")