Changeset 37935 for trunk/ippToPsps/jython/objectbatch.py

Timestamp:

Feb 25, 2015, 1:59:43 PM (11 years ago)

Author:

heather

Message:

forced warp batches for sas37 are now working!

File:

• trunk/ippToPsps/jython/objectbatch.py (modified) (12 diffs)

trunk/ippToPsps/jython/objectbatch.py

@@ -186 +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
@@ -224 +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]")
@@ -233 +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
@@ -257 +263 @@
         except:
             self.logger.errorPair("failed sql", sql)
+            raise
             return False
 
@@ -275 +282 @@
         except:
             self.logger.errorPair("failed sql", sql)
+            raise
             return False
         self.logger.infoPair("updating objName", "using means")
@@ -291 +299 @@
         except:
             self.logger.errorPair("failed sql", sql)
+            raise
             return False
  
@@ -309 +318 @@
         except:
             self.logger.errorPair("failed sql", sql)
+            raise
             return False
 
@@ -329 +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")
@@ -338 +349 @@
             except:
                 self.logger.errorPair("Couldn't squash out of range stuff", sql)
-                return False
+                raise
 
         
@@ -420 +431 @@
     
         rs = self.scratchDb.executeQuery(sql)
+        
         rs.first()
         nToDelete = rs.getInt(1)
@@ -437 +449 @@
         except:
             self.logger.errorPair("Couldn't cull outsiders from ObjectThin table", sql)
-            return False
+            raise
 
         ##Don't do this till after MeanObject
@@ -467 +479 @@
         except:
             self.logger.errorPair("Couldn't populate MeanObject table", sql)
-            return False
+            raise
 
         self.logger.infoPair("Adding 'row' columns to", "MeanObject table")