Changeset 38841 for trunk/ippToPsps/jython/detectionbatch.py

Timestamp:

Oct 10, 2015, 2:11:52 PM (11 years ago)

Author:

eugene

Message:

fix test for table existence (Chip.psf vs Chip_psf)

File:

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

trunk/ippToPsps/jython/detectionbatch.py

@@ -680 +680 @@
                 if x==7 and y==7: continue
 
-                ota = "XY%d%d" % (x, y)
-                extension = ota + "_psf"
-                if extension not in self.tablesLoaded: continue
-
-                self.scratchDb.createIndex(extension, "IPP_IDET")
-
-        extension = "Chip_psf"
-        if extension in self.tablesLoaded:
-            # try the test Chip
-            self.scratchDb.createIndex(extension, "IPP_IDET")
+                cmfTable = "XY%d%d.psf" % (x, y)
+                mysTable = "XY%d%d_psf" % (x, y)
+                if cmfTable not in self.tablesLoaded: continue
+
+                self.scratchDb.createIndex(mysTable, "IPP_IDET")
+
+        cmfTable = "XY%d%d.psf" % (x, y)
+        mysTable = "XY%d%d_psf" % (x, y)
+        if cmfTable in self.tablesLoaded: 
+            self.scratchDb.createIndex(mysTable, "IPP_IDET")
 
         self.logger.infoPair("created indexes on", "IPP tables")      
@@ -860 +860 @@
     def populatePspsTables(self):
 
+        print "********** ***************"
+        for table in self.tablesLoaded:
+            print "table: " + str(table)
+        print "--------------------------"
+
         # loop through all OTAs again to update with DVO IDs
         self.skipBatch = False
@@ -882 +887 @@
 
                 ota = "XY%d%d" % (x, y)
-                extension = ota + "_psf"
+                extension = ota + ".psf"
                 if extension not in self.tablesLoaded: continue
 
@@ -893 +898 @@
 
 
-        extension = "Chip_psf"
+        extension = "Chip.psf"
         if extension in self.tablesLoaded:
             if self.populatePspsTablesChip("Chip", 0, 0, results, tables): otaCount = otaCount + 1