Changeset 35012

Timestamp:

Jan 22, 2013, 5:09:40 AM (13 years ago)

Author:

eugene

Message:

fix some errors in the table/chip split

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/detectionbatch.py (modified) (5 diffs)

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

@@ -688 +688 @@
                 self.scratchDb.createIndex(extension, "IPP_IDET")
         # try the test Chip
-        self.scratchDb.createIndex(Chip_psf, "IPP_IDET")
+        self.scratchDb.createIndex("Chip_psf", "IPP_IDET")
 
         self.logger.infoPair("created indexes on", "IPP tables")      
@@ -712 +712 @@
     Does the processing, i.e. pulling stuff from IPP tables into PSPS tables
     '''
-    def populatePspsTablesChip(self, chipname, x, y):
+    def populatePspsTablesChip(self, chipname, x, y, results, tables):
         #self.logger.infoTitle("Processing " + chipname)
         if not self.scratchDb.astrometricSolutionOK(chipname):
@@ -738 +738 @@
                 results['NULLOBJID'],
                 rowCount)
-        totalOriginal = totalOriginal + results['ORIGINALTOTAL']
-        totalSatDet = totalSatDet + results['SATDET']
-        totalNulIInstFlux = totalNulIInstFlux + results['NULLINSTFLUX']
-        totalNullPeakFlux = totalNullPeakFlux + results['NULLPEAKADU']
-        totalNullObjID = totalNullObjID + results['NULLOBJID']
-        totalDetections = totalDetections + rowCount
+        self.totalOriginal     = self.totalOriginal + results['ORIGINALTOTAL']
+        self.totalSatDet       = self.totalSatDet + results['SATDET']
+        self.totalNulIInstFlux = self.totalNulIInstFlux + results['NULLINSTFLUX']
+        self.totalNullPeakFlux = self.totalNullPeakFlux + results['NULLPEAKADU']
+        self.totalNullObjID    = self.totalNullObjID + results['NULLOBJID']
+        self.totalDetections   = self.totalDetections + rowCount
         #self.logger.info("updated totals")
         # check we have something in this Detection table TODO add this to table above
         if rowCount < 1:
-            self.logger.debugPair("Skipping empty table for chipname", chipname)
+            self.logger.infoPair("Skipping empty table for chipname", chipname)
             return False;
 
@@ -783 +783 @@
         otaCount = 0
         results = {}
-        totalOriginal = totalSatDet = totalNulIInstFlux = totalNullPeakFlux = totalNullObjID = totalDetections = 0
+        self.totalOriginal = self.totalSatDet = self.totalNulIInstFlux = self.totalNullPeakFlux = self.totalNullObjID = self.totalDetections = 0
         self.logger.info("+-------+---------------+---------------+---------------+---------------+---------------+---------------+")
         self.logger.info("|  OTA  | Initial total |   Sat Det     | NULL instFlux | NULL peak ADU | NULL obj ID   |  Remainder    |")
@@ -799 +799 @@
                 if ota not in self.imageIDs: continue
 
-                if populatePspsTables(ota, x, y): otaCount = otaCount + 1
-
-        if populatePspsTables("Chip", 0, 0): otaCount = otaCount + 1
+                if self.populatePspsTablesChip(ota, x, y, results, tables): otaCount = otaCount + 1
+
+        if self.populatePspsTablesChip("Chip", 0, 0, results, tables): otaCount = otaCount + 1
 
         # print totals
         self.logger.info("+-------+---------------+---------------+---------------+---------------+---------------+---------------+")
         self.logger.info("| Total | %13d | %13d | %13d | %13d | %13d | %13d |", 
-                totalOriginal, 
-                totalSatDet, 
-                totalNulIInstFlux, 
-                totalNullPeakFlux, 
-                totalNullObjID,
-                totalDetections)
+                self.totalOriginal, 
+                self.totalSatDet, 
+                self.totalNulIInstFlux, 
+                self.totalNullPeakFlux, 
+                self.totalNullObjID,
+                self.totalDetections)
         self.logger.info("+-------+---------------+---------------+---------------+---------------+---------------+---------------+")