Changeset 39315

Timestamp:

Jan 13, 2016, 4:40:20 PM (11 years ago)

Author:

eugene

Message:

fix a typo and clean up verbosity

Location:

trunk/ippToPsps

Files:

• jython/batch.py (modified) (1 diff)
• jython/detectionbatch.py (modified) (4 diffs)
• test/sastest.sh (modified) (2 diffs)

trunk/ippToPsps/jython/batch.py

@@ -608 +608 @@
            # this should be sufficient to handle all NANs (which go in as NULL)
            _table = stilts.tpipe(_table, cmd='replaceval "" -999 *')
-           self.logger.infoPair('regex', regex)
-           self.logger.infoPair('table', table)
+           self.logger.debugPair('regex', regex)
+           self.logger.debugPair('table', table)
            match = re.search(regex, table)
            newTableName = match.group(1)

trunk/ippToPsps/jython/detectionbatch.py

@@ -275 +275 @@
         
         # other header fields which depend on pltscale:
-        momentMajor =        self.getKeyFloat(header, "%.8f", 'IQ_FW1'))
-        momentMinor =        self.getKeyFloat(header, "%.8f", 'IQ_FW2'))
-        momentM2C =          self.getKeyFloat(header, "%.8f", 'IQ_M2C'))
-        momentM2S =          self.getKeyFloat(header, "%.8f", 'IQ_M2S'))
-        momentM3 =           self.getKeyFloat(header, "%.8f", 'IQ_M3'))
-        momentM4 =           self.getKeyFloat(header, "%.8f", 'IQ_M4'))
+        momentMajor =        self.getKeyFloat(header, "%.8f", 'IQ_FW1')
+        momentMinor =        self.getKeyFloat(header, "%.8f", 'IQ_FW2')
+        momentM2C =          self.getKeyFloat(header, "%.8f", 'IQ_M2C')
+        momentM2S =          self.getKeyFloat(header, "%.8f", 'IQ_M2S')
+        momentM3 =           self.getKeyFloat(header, "%.8f", 'IQ_M3')
+        momentM4 =           self.getKeyFloat(header, "%.8f", 'IQ_M4')
 
         if (momentMajor != "NULL"): momentMajor *= pltscale
@@ -403 +403 @@
     '''
     def populateImageDetEffMetaTablePart1(self, ota, header, deteffHeader):
-        print "---- *** populate ImageDetEffMetaTablePart1"
+        # print "---- *** populate ImageDetEffMetaTablePart1"
         ippTableName = ota + "_deteff"
         tableName = "ImageDetEffMeta_" + ota
@@ -456 +456 @@
     '''
     def populateImageDetEffMetaTablePart2(self, ota):
-        print "---- *** populate ImageDetEffMetaTablePart2"
+        # print "---- *** populate ImageDetEffMetaTablePart2"
 
         ippTableName = ota + "_deteff"
@@ -963 +963 @@
     def populatePspsTables(self):
 
-        print "********** ***************"
-        for table in self.tablesLoaded:
-            print "table: " + str(table)
-        print "--------------------------"
+        # print "********** ***************"
+        # for table in self.tablesLoaded:
+        #     print "table: " + str(table)
+        # print "--------------------------"
 
         # loop through all OTAs again to update with DVO IDs

trunk/ippToPsps/test/sastest.sh

@@ -17 +17 @@
 # takes a long time to generate the gpc1 database (or at least the dvo database)
 # default is OFF
+# need to turn on mkgpc1 or mkdvo explicitly
 set mkgpc1       = 0
 set mkdvo        = 0
@@ -136 +137 @@
  switch ("$targ[1]")
   case +all
-    # need to turn on mkgpc1 or mkdvo explicitly
-    set mkdvo        = 0
-    set mkgpc1       = 0
     set initdb       = 1
     set initscratch  = 1