Changeset 38839

Timestamp:

Oct 10, 2015, 1:40:08 PM (11 years ago)

Author:

eugene

Message:

fix test for table existence (called test before measurement)

Location:

trunk/ippToPsps/jython

Files:

• batch.py (modified) (2 diffs)
• detectionbatch.py (modified) (4 diffs)

trunk/ippToPsps/jython/batch.py

@@ -442 +442 @@
     '''
     def importIppTables(self, columns="*", filter=""):
-
+        
         self.logger.infoPair("Importing tables with filter", filter)
-
+        
         # print "trying to read ", self.fits.getPath()
 
@@ -489 +489 @@
             self.tablesLoaded.append(table.name)
 
-      self.logger.infoPair("Done. Imported", "%d tables" % count)
-      self.indexIppTables()
-
-      return True
+        self.logger.infoPair("Done. Imported", "%d tables" % count)
+        self.indexIppTables()
+
+        return True
 
     '''

trunk/ippToPsps/jython/detectionbatch.py

@@ -653 +653 @@
                     
                     ota = "XY%d%d" % (x, y)
-                    if ota not in self.imageIDs: continue
-                
-                    # I need better control over this..
-                    if False and self.config.test and not ((x == 0) and (y == 1)):
-                        print "skipping ota: " + ota
-                        continue
-                        
                     self.alterPspsTablesChip(ota, ota + ".hdr", x, y)
 
-        if self.config.camera == "simtest":
-            # try the test Chip
-            self.alterPspsTablesChip("Chip", "Chip.hdr", 0, 0)
-
-        # now run DVO code to get all IDs ( XXX deprecated, uses dvograbber)
-        # if not self.getIDsFromDVO(): return False
+        self.alterPspsTablesChip("Chip", "Chip.hdr", 0, 0)
 
         # dec is reserved in MySQL, so STILTS replaces if with dec_, which is not the name of 
@@ -693 +681 @@
 
                 ota = "XY%d%d" % (x, y)
-                if ota not in self.imageIDs: continue
-
                 extension = ota + "_psf"
+                if extension not in self.tablesLoaded: continue
+
                 self.scratchDb.createIndex(extension, "IPP_IDET")
 
-        # try the test Chip
-        self.scratchDb.createIndex("Chip_psf", "IPP_IDET")
+        extension = "Chip_psf"
+        if extension in self.tablesLoaded:
+            # try the test Chip
+            self.scratchDb.createIndex(extension, "IPP_IDET")
 
         self.logger.infoPair("created indexes on", "IPP tables")      
@@ -892 +882 @@
 
                 ota = "XY%d%d" % (x, y)
-                if ota not in self.imageIDs: continue
-
-                if False and self.config.test and not ((x == 0) and (y == 1)):
-                    print "skipping ota " + ota
-                    continue
+                extension = ota + "_psf"
+                if extension not in self.tablesLoaded: continue
 
                 if self.populatePspsTablesChip(ota, x, y, results, tables): otaCount = otaCount + 1
@@ -906 +893 @@
 
 
-        if "Chip" in self.imageIDs:
+        extension = "Chip_psf"
+        if extension in self.tablesLoaded:
             if self.populatePspsTablesChip("Chip", 0, 0, results, tables): otaCount = otaCount + 1
             if self.skipBatch: