Changeset 32106

Timestamp:

Aug 16, 2011, 8:34:32 AM (15 years ago)

Author:

rhenders

Message:

now collecting stats per chip and printing to log in a table

File:

• trunk/ippToPsps/jython/detectionbatch.py (modified) (6 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -363 +363 @@
     Populates the Detection table for this OTA
     '''
-    def populateDetectionTable(self, ota):
+    def populateDetectionTable(self, ota, results):
 
         pspsTableName = "Detection_" + ota
@@ -378 +378 @@
         sql = "DELETE FROM " + ippTableName + " WHERE PSF_INST_MAG < -17.5"
         self.scratchDb.execute(sql)
-        DELETED = BEFORE - self.scratchDb.getRowCount(ippTableName)
-        self.logger.infoPair("Saturated detections", "%d deleted" % DELETED)
+        #DELETED = BEFORE - self.scratchDb.getRowCount(ippTableName)
+        results['SATDET'] = BEFORE - self.scratchDb.getRowCount(ippTableName)
+        #self.logger.infoPair("Saturated detections", "%d deleted" % DELETED)
 
         # insert all detections into table
@@ -442 +443 @@
 
         # now delete bad flux and bad chip positions
-        self.scratchDb.reportAndDeleteRowsWithNULLS(pspsTableName, "instFlux")
-        self.scratchDb.reportAndDeleteRowsWithNULLS(pspsTableName, "peakADU")
+        results['NULLINSTFLUX'] = self.scratchDb.reportAndDeleteRowsWithNULLS(pspsTableName, "instFlux")
+        results['NULLPEAKADU'] = self.scratchDb.reportAndDeleteRowsWithNULLS(pspsTableName, "peakADU")
 
     '''
@@ -638 +639 @@
         tables = []    
         otaCount = 0
+        results = {}
+        self.logger.info("+-------+---------------+---------------+---------------+---------------+---------------+")
+        self.logger.info("|  OTA  |   Sat Det     | NULL instFlux | NULL peak ADU | NULL obj ID   |  Remainder    |")
+        self.logger.info("+-------+---------------+---------------+---------------+---------------+---------------+")
         for x in range(self.startX, self.endX):
             for y in range(self.startY, self.endY):
@@ -650 +655 @@
                 if ota not in sourceIDs: continue
 
-                self.logger.infoTitle("Processing " + ota)
+                #self.logger.infoTitle("Processing " + ota)
 
                 # populate remainder of tables
-                self.populateDetectionTable(ota)
+                self.populateDetectionTable(ota, results)
 
                 # now add DVO IDs
                 self.updateDvoIDs("Detection_" + ota, sourceIDs[ota], imageIDs[ota])
-                self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + ota, "objID")
+                results['NULLOBJID'] = self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + ota, "objID")
                 self.updateImageID("Detection_" + ota, x, y) 
                 self.populateLikelihoods("Detection_" + ota)
-                
-                # check we have something in this Detection table
-                if self.scratchDb.getRowCount("Detection_" + ota) < 1:
-                    self.logger.infoPair("Skipping empty table for ota", ota)
+                rowCount = self.scratchDb.getRowCount("Detection_" + ota) 
+                self.logger.info("| %5s | %13d | %13d | %13d | %13d | %13d |", 
+                        ota, 
+                        results['SATDET'], 
+                        results['NULLINSTFLUX'], 
+                        results['NULLPEAKADU'], 
+                        results['NULLOBJID'],
+                        rowCount)
+
+                # check we have something in this Detection table TODO add this to table above
+                if rowCount < 1:
+                    self.logger.debugPair("Skipping empty table for ota", ota)
                     continue;
 
@@ -683 +696 @@
                 otaCount = otaCount + 1
 
+        # TODO print totals here
+        self.logger.info("+-------+---------------+---------------+---------------+---------------+---------------+")
+
         # if we only have one table export, i.e. FrameMeta, then get out of here
         if len(self.tablesToExport) == 1: