Changeset 37241

Timestamp:

Aug 12, 2014, 3:38:38 PM (12 years ago)

Author:

eugene

Message:

dropping more test prints

Location:

branches/eam_branches/ipp-20140717/ippToPsps/jython

Files:

• detectionbatch.py (modified) (1 diff)
• mysql.py (modified) (3 diffs)
• objectbatch.py (modified) (1 diff)
• scratchdb.py (modified) (2 diffs)
• stackbatch.py (modified) (8 diffs)

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

@@ -381 +381 @@
 
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName)
-        print "sql: " + sql
-
-        self.scratchDb.execute(sql)
+
+        try: self.scratchDb.execute(sql)
+        except:
+            self.logger.errorPair("failed sql: ", sql)
+            raise
 
         # NOTE : Flux limits : in the current PSPS schema, negative fluxes 

branches/eam_branches/ipp-20140717/ippToPsps/jython/mysql.py

@@ -83 +83 @@
     '''
     def lockTable(self, table):
-        print "Locking table: " + table
+        # print "Locking table: " + table
         self.execute("LOCK TABLES " + table + " WRITE")
 
@@ -90 +90 @@
     '''
     def unlockTables(self):
-        print "Unlocking tables"
+        # print "Unlocking tables"
         self.execute("UNLOCK TABLES")
 
@@ -117 +117 @@
         while (rs.next()):
             tableName = rs.getString(1)
-            print "table: " + tableName
+            # print "table: " + tableName
         rs.close()
 

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

@@ -155 +155 @@
 
 
-            self.logger.info(sql)
-            self.scratchDb.execute(sql)
+            try: self.scratchDb.execute(sql)
+            except:
+                self.logger.errorPair("failed update MeanObject", sql)
+                raise
 
         # now set to null all MeanMagErr values > 0.5 (cut set by Gene, 2012-04-12)

branches/eam_branches/ipp-20140717/ippToPsps/jython/scratchdb.py

@@ -427 +427 @@
             # if no returned rows, return an error
             if not rs.next():
-                print "DVO lacks imageID ", imageID
-                print "sql: ", sql
+                self.logger.infoPair("DVO lacks imageID ", imageID)
                 return False
 
@@ -436 +435 @@
 
             else:
-                print "DVO has wrong imageID? ", imageID
-                print "result was ", rs.getInt(1)
-                print "sql: ", sql
+                self.logger.error("DVO has wrong imageID? ")
+                self.logger.error("imageID: ", imageID)
+                self.logger.error("EXTERN_ID: ", rs.getInt(1))
+                self.logger.infoPair("sql: ", sql)
                 raise
 

branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

@@ -329 +329 @@
             sqlLine.group("a."+filter+"infoFlag2",     "(b.flags << 13)")
             sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND b.imageID = " + str(imageID))
-            self.logger.infoPair('sql', sql)     
 
             try: self.scratchDb.execute(sql)
@@ -351 +350 @@
 
             sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID=b.IPP_IDET")
-            self.logger.infoPair('sql', sql)     
 
             # index the (f)ippDetectIDs for the next steps?
@@ -428 +426 @@
             sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET")
 
-            self.logger.infoPair('sql', sql)     
             try:
                 self.scratchDb.execute(sql)
@@ -445 +442 @@
             sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
 
-            self.logger.infoPair('sql', sql)     
             try:
                 self.scratchDb.execute(sql)
@@ -558 +554 @@
         sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
 
-        self.logger.infoPair('sql', sql)     
         try:
             self.scratchDb.execute(sql)
@@ -597 +592 @@
         sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a.objID = c.objID")
 
-        self.logger.infoPair('sql', sql)     
         try:
             self.scratchDb.execute(sql)
@@ -817 +811 @@
             
         sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET AND  " + psfCondition)
-        self.logger.infoPair("sql",sql)
+
         self.scratchDb.execute(sql)
 
@@ -840 +834 @@
             sqlLine.group(field + "Std",       field + "Std" + " * POW(10, 3.56 - 0.4* b.zp)")
         sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
-        self.logger.infoPair("sql",sql)
         self.scratchDb.execute(sql)