Changeset 38841

Timestamp:

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

Author:

eugene

Message:

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

Location:

trunk/ippToPsps/jython

Files:

• detectionbatch.py (modified) (4 diffs)
• stackbatch.py (modified) (9 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

trunk/ippToPsps/jython/stackbatch.py

@@ -549 +549 @@
                 continue
 
-            cmfTable = filter + "SkyChip_xsrc"
+            cmfTable = filter + "SkyChip.xsrc"
+            mysTable = filter + "SkyChip_xsrc"
             if not cmfTable in self.tablesLoaded:
                 self.logger.infoPair("no xsrc data for filter" , filter) 
@@ -630 +631 @@
             return True
 
-        cmfTable = filter + "SkyChip_xfit"
+        cmfTable = filter + "SkyChip.xfit"
+        mysTable = filter + "SkyChip_xfit"
         if not cmfTable in self.tablesLoaded:
             self.logger.infoPair("no xfit data for filter" , filter) 
             return True
 
-        if self.scratchDb.getRowCount(cmfTable) <=0 :
+        if self.scratchDb.getRowCount(mysTable) <=0 :
             self.logger.infoPair("no extended source information, trying to skip",filter)
             return True
@@ -644 +646 @@
         magtime = "%.5f" % (2.5*math.log10(float(header['EXPTIME'])))
 
-        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + cmfTable + " AS b SET")
+        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + mysTable + " AS b SET")
 
         sqlLine.group("a."+filter+"haveData",              "'1'")
@@ -798 +800 @@
             return True
 
-        cmfTable = filter + "SkyChip_xsrc"
+        cmfTable = filter + "SkyChip.xsrc"
+        mysTable = filter + "SkyChip_xsrc"
         if not cmfTable in self.tablesLoaded:
             self.logger.infoPair("no xsrc data for filter" , filter) 
             return True
 
-        if self.scratchDb.getRowCount(cmfTable) <=0 :
+        if self.scratchDb.getRowCount(mysTable) <=0 :
             self.logger.infoPair("no extended source information, trying to skip", filter)
             return True
@@ -817 +820 @@
 
         self.logger.infoPair("Adding", "petrosians for extended sources")
-        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + cmfTable + " AS b SET")
+        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + mysTable + " AS b SET")
 
         sqlLine.group("a."+filter+"haveData",         "'1'")
@@ -951 +954 @@
 
         # set the flux values from the cmf file
-        cmfTable = filter + "SkyChip_xrad"
+        cmfTable = filter + "SkyChip.xrad"
+        mysTable = filter + "SkyChip_xrad"
 
         # skip this table if it was not loaded from the cmf
@@ -959 +963 @@
 
         # we have variable numbers of these columns. find out which are in use
-        sql = "DESCRIBE " + cmfTable + " 'aper_fill_%'"
+        sql = "DESCRIBE " + mysTable + " 'aper_fill_%'"
         rs = self.scratchDb.executeQuery(sql)
         rs.first()
@@ -983 +987 @@
 
         # generate the sql to do the necessary ops on the columns    
-        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + cmfTable + " AS b SET ")
+        sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + mysTable + " AS b SET ")
 
         sqlLine.group("a."+filter+"haveData", "'1'")
@@ -1116 +1120 @@
             self.logger.infoPair("Creating indexes on", "IPP tables")
 
-            cmfTable = filter + "SkyChip_psf"
-            if cmfTable in self.tablesLoaded: self.scratchDb.createIndex(cmfTable, "IPP_IDET")
-
-            cmfTable = filter + "SkyChip_xfit"
-            if cmfTable in self.tablesLoaded: self.scratchDb.createIndex(cmfTable, "IPP_IDET")
-
-            cmfTable = filter + "SkyChip_xrad"
-            if cmfTable in self.tablesLoaded: self.scratchDb.createIndex(cmfTable, "IPP_IDET")
-
-            cmfTable = filter + "SkyChip_xsrc"
-            if cmfTable in self.tablesLoaded: self.scratchDb.createIndex(cmfTable, "IPP_IDET")
+            cmfTable = filter + "SkyChip.psf"
+            mysTable = filter + "SkyChip_psf"
+            if cmfTable in self.tablesLoaded: self.scratchDb.createIndex(mysTable, "IPP_IDET")
+
+            cmfTable = filter + "SkyChip.xfit"
+            mysTable = filter + "SkyChip_xfit"
+            if cmfTable in self.tablesLoaded: self.scratchDb.createIndex(mysTable, "IPP_IDET")
+
+            cmfTable = filter + "SkyChip.xrad"
+            mysTable = filter + "SkyChip_xrad"
+            if cmfTable in self.tablesLoaded: self.scratchDb.createIndex(mysTable, "IPP_IDET")
+
+            cmfTable = filter + "SkyChip.xsrc"
+            mysTable = filter + "SkyChip_xsrc"
+            if cmfTable in self.tablesLoaded: self.scratchDb.createIndex(mysTable, "IPP_IDET")
 
         return True