Changeset 38995 for trunk/ippToPsps/jython/batch.py

Timestamp:

Oct 28, 2015, 8:29:33 PM (11 years ago)

Author:

eugene

Message:

add -stilts option; fix stilts and regex for detectionbatch; add tableprefix option for stacks; alter photcode.type to type_as_int

File:

• trunk/ippToPsps/jython/batch.py (modified) (5 diffs)

trunk/ippToPsps/jython/batch.py

@@ -453 +453 @@
     '''
     def importIppTables(self, columns="*", filter=""):
-        if self.useOhanaMYSQLtoFITS:
+        if self.config.useOhanaMYSQLtoFITS:
             if not self.importIppTablesOhana():
                 self.logger.errorPair("problem running", "importIppTablesOhana")
@@ -480 +480 @@
             return False
 
-        self.scratchDb.loadFITStoMYSQL(self.fits.getPath(), "none")
+        self.scratchDb.loadFITStoMYSQL(self.fits.getPath())
 
         ## may need to do this with direct sql:
@@ -515 +515 @@
     def importIppTablesStilts(self, columns="*", filter=""):
         
-        self.logger.infoPair("Importing tables with filter", filter)
+        self.logger.infoPair("Importing tables (stilts) with filter", filter)
         
-        # print "trying to read ", self.fits.getPath()
+        print "trying to read ", self.fits.getPath()
 
         try:
@@ -527 +527 @@
         self.tablesLoaded = []
 
+        print "read tables from ", self.fits.getPath()
+
         count = 0
         for table in tables:
 
             # example of listing all columns in a table:
-            ## print "-----table: " + table.name
-            ## columns = table.columns()
-            ## for column in columns:
-            ##     print column
-            ## 
-            ## print "-----"
-
-            # print "import smf table ", table
+            print "-----table: " + table.name
+            myColumns = table.columns()
+            for column in myColumns:
+                print column
+            print "-----"
+
+            print "import smf table ", table.name
+
             match = re.match(filter, table.name)
             if not match: continue
@@ -555 +557 @@
             self.logger.debug("Removing Infinity values from all columns")
             table = stilts.tpipe(table, cmd='keepcols "' + columns + '"')
+            print "-----"
             table = stilts.tpipe(table, cmd='replaceval -Infinity null *')
+            print "-----"
             table = stilts.tpipe(table, cmd='replaceval Infinity null *')
-            # print "cleaned up values ", table
+            print "cleaned up values ", table.name
 
             try: