Changeset 38052 for branches/eam_branches/ipp-20150112/ippToPsps/jython/objectbatch.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/objectbatch.py (modified) (13 diffs)

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

@@ -92 +92 @@
     
     def updatePspsUniqueIDs(self):
-        sql = "UPDATE ObjectThin join (select @r:=@r+1 rownum, objID from \
-        (select @r:=0) r, ObjectThin t) as foo using (objID) set \
-        uniquePspsOBid = ((" +str(self.batchID) +"*1000000000 ) + rownum)";
+ #       sql = "UPDATE ObjectThin join (select @r:=@r+1 rownum, objID from \
+ #       (select @r:=0) r, ObjectThin t) as foo using (objID) set \
+ #       uniquePspsOBid = ((" +str(self.batchID) +"*1000000000 ) + rownum)";
+
+        sql = "UPDATE ObjectThin set uniquePspsOBid = (("+str(self.batchID)+"*1000000000 ) + row)"
         try: self.scratchDb.execute(sql)
         except:
@@ -184 +186 @@
                    SET " + filter[1] + "MeanPSFMagErr = null \
                    WHERE " + filter[1] + "MeanPSFMagErr > " + str(cut)
-            self.scratchDb.execute(sql)
-
+            try: self.scratchDb.execute(sql)
+            except:
+                self.logger.infoPair("failed sql",sql)
+                raise
     '''
     Inserts stuff for all mags
@@ -222 +226 @@
             sql += "ObjectThin.nStackDetections = ObjectThin.nStackDetections + cps.NSTACK_DET"
             self.logger.info(sql)
-            self.scratchDb.execute(sql)
-
+            try: self.scratchDb.execute(sql)
+            except:
+                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]")
@@ -231 +237 @@
             sql += "SET nDetections = nDetections + n" + filter[1]
             sql += " WHERE n" + filter[1] + " != -999"
-            self.scratchDb.execute(sql)
-
+            try: self.scratchDb.execute(sql)
+            except:
+                self.logger.infoPair("failed sql",sql)
+                raise
     '''
     give objectName to objectThin
@@ -255 +263 @@
         except:
             self.logger.errorPair("failed sql", sql)
+            raise
             return False
 
@@ -273 +282 @@
         except:
             self.logger.errorPair("failed sql", sql)
+            raise
             return False
         self.logger.infoPair("updating objName", "using means")
@@ -289 +299 @@
         except:
             self.logger.errorPair("failed sql", sql)
+            raise
             return False
  
@@ -307 +318 @@
         except:
             self.logger.errorPair("failed sql", sql)
+            raise
             return False
 
@@ -327 +339 @@
             except:
                 self.logger.errorPair("Couldn't squash out of range stuff", sql)
-                return False
+                raise
+        
 
             self.logger.infoPair("setting to null  > 1e-38 and < 1e-38 in", "cps FLUX_KRON")
@@ -336 +349 @@
             except:
                 self.logger.errorPair("Couldn't squash out of range stuff", sql)
-                return False
+                raise
 
         
@@ -418 +431 @@
     
         rs = self.scratchDb.executeQuery(sql)
+        
         rs.first()
         nToDelete = rs.getInt(1)
@@ -435 +449 @@
         except:
             self.logger.errorPair("Couldn't cull outsiders from ObjectThin table", sql)
-            return False
-
+            raise
+
+        ##Don't do this till after MeanObject
+        ##self.dvoObjects.purgeRegion(self.region)
+        self.logger.infoPair("updatePspsUniqueIDs","start")
+        self.updatePspsUniqueIDs()
+        self.logger.infoPair("updatePspsUniqueIDs","end")
         self.logger.infoPair("Dropping row column from", "ObjectThin table")
         self.scratchDb.dropColumn("ObjectThin", "row")
         ##self.logger.infoPair("Purging from scratch Db", self.region + " region")
-
+        self.logger.infoPair("Dropped row column", "objectThin")
         ##Don't do this till after MeanObject
-        ##self.dvoObjects.purgeRegion(self.region)
-
-        self.updatePspsUniqueIDs()
-        
+
         self.setMinMaxObjID(["ObjectThin"])
 
@@ -463 +479 @@
         except:
             self.logger.errorPair("Couldn't populate MeanObject table", sql)
-            return False
+            raise
 
         self.logger.infoPair("Adding 'row' columns to", "MeanObject table")