Changeset 39027 for trunk

Timestamp:

Nov 2, 2015, 2:42:04 PM (11 years ago)

Author:

eugene

Message:

clean up some test vebosity

Location:

trunk/ippToPsps

Files:

• jython/batch.py (modified) (2 diffs)
• jython/forcedgalaxybatch.py (modified) (4 diffs)
• jython/mysql.py (modified) (1 diff)
• jython/scratchdb.py (modified) (2 diffs)
• test/mkgpc1data.dvo (modified) (3 diffs)

trunk/ippToPsps/jython/batch.py

@@ -534 +534 @@
 
             # example of listing all columns in a table:
-            print "-----table: " + table.name
-            myColumns = table.columns()
-            for column in myColumns:
-                print column
-            print "-----"
+            ## print "-----table: " + table.name
+            ## myColumns = table.columns()
+            ## for column in myColumns:
+            ##     print column
+            ## print "-----"
 
             print "import smf table ", table.name
@@ -558 +558 @@
             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.name
 
             try:

trunk/ippToPsps/jython/forcedgalaxybatch.py

@@ -137 +137 @@
 
         for filter in filters:
-            filterID = self.scratchDb.getFilterId(filter[1])
-            photcode = self.scratchDb.getPhotoCalID("GPC1." + filter[1] + ".ForcedWarp")
+            filterID = self.scratchDb.getFilterID(filter[1])
+
+            photcodeName = "NONE"
+            if self.config.camera == "gpc1":
+                photcodeName = "GPC1." + filter[1] + ".ForcedWarp"
+            if self.config.camera == "simtest":
+                photcodeName = "SIMTEST." + filter[1] + ".ForcedWarp"
+
+            photcode = self.scratchDb.getPhotcodeByName(photcodeName)
 
             # This is going to need to join elsewhere to get all the fields?
@@ -161 +168 @@
             # sqlLine.group("a." + filter[1] + "GalDecErr",       "b.DEC_ERR")
 
-            sql = sqlLine.makeEquals("WHERE a.objID = b.OBJ_ID AND a.galModelType = b.MODEL_TYPE AND b.Photcode = " + photcode)
+            sql = sqlLine.makeEquals("WHERE a.objID = b.OBJ_ID AND a.galModelType = b.MODEL_TYPE AND b.Photcode = " + str(photcode))
 
             self.scratchDb.execute(sql)
@@ -192 +199 @@
         self.logger.infoPair("Adding 'row' columns to", "Forced Galaxy, cpt tables")
         self.scratchDb.addRowCountColumn("ForcedGalaxyShape", "row")
-        self.scratchDb.addRowCountColumn(cpsTableName, "row")
+        self.scratchDb.addRowCountColumn(cpqTableName, "row")
 
         self.logger.infoPair("generating unique ids for ","ForcedGalaxyShape")
@@ -221 +228 @@
     def populatePspsTables(self):
         
-        if not self.populateForcedGalaxyShapeTable(): return False
+        if not self.populateForcedGalaxyShapeTable(): 
+            return False
+            
+        return True

trunk/ippToPsps/jython/mysql.py

@@ -470 +470 @@
 
         sql = "SELECT COUNT(*) FROM " + table
-        try:
-            rs = self.executeQuery(sql)  
-            rs.first()
-            return rs.getInt(1)
-        except:
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
             self.logger.exception("Could not count rows for table: '" + table + "'")
             return -1
+
+        return rs.getInt(1)
 
     '''

trunk/ippToPsps/jython/scratchdb.py

@@ -190 +190 @@
 
         sql = "SELECT FLAGS FROM " + self.dvoImagesTable + " WHERE EXTERN_ID = %s" % (externID)
-        try:
-            rs = self.executeQuery(sql)  
-            rs.first()
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
+            self.logger.errorPair("Unable to get flags from dvo using", sql)
+        else:
             flags = rs.getInt(1)
-        except:
-            self.logger.errorPair("Unable to get flags from dvo using", sql)
+
         return flags
 
@@ -206 +207 @@
 
         sql = "SELECT PHOTCODE FROM " + self.dvoImagesTable + " WHERE EXTERN_ID = %s" % (externID)
-        try:
-            rs = self.executeQuery(sql)  
-            rs.first()
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
+            self.logger.errorPair("Unable to get photcode from dvo with", sql)
+        else:
             photcode = rs.getInt(1)
-        except:
-            self.logger.errorPair("Unable to get photcode from dvo with", sql)
-
+
+        return photcode
+
+    '''
+    Gets photcode (aka photoCalID from dvo table)
+    '''
+    def getPhotcodeByName(self, photcodeName):
+
+        photcode = -1
+
+        sql = "SELECT CODE FROM %s WHERE NAME = '%s'" % (self.dvoPhotcodesTable, photcodeName)
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
+            self.logger.errorPair("No photcode found for ", photcodeName)
+            print "--- sql: " + sql
+            os._exit(2)
+
+        photcode = rs.getInt(1)
         return photcode
 

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -51 +51 @@
 
 list stackdata
-# stk_id sky_id filename         M_off filter
-  1      1      $OUTDIR/stack.01 0.010 g
-  2      2      $OUTDIR/stack.02 0.020 g
-  3      3      $OUTDIR/stack.03 0.030 g
-  4      1      $OUTDIR/stack.04 0.025 r
-  5      2      $OUTDIR/stack.05 0.035 r
-  6      3      $OUTDIR/stack.06 0.045 r
+# stk_id sky_id filename         M_off filter  forcedgalaxy          
+  1      1      $OUTDIR/stack.01 0.010 g       $OUTDIR/fgal.01 
+  2      2      $OUTDIR/stack.02 0.020 g       $OUTDIR/fgal.02 
+  3      3      $OUTDIR/stack.03 0.030 g       $OUTDIR/fgal.03 
+  4      1      $OUTDIR/stack.04 0.025 r       $OUTDIR/fgal.04 
+  5      2      $OUTDIR/stack.05 0.035 r       $OUTDIR/fgal.05 
+  6      3      $OUTDIR/stack.06 0.045 r       $OUTDIR/fgal.06 
 end
  
@@ -339 +339 @@
     $stkID = $word:0
     $rawfile = $word:2\.txt
-    $cmffile = $word:2\.cmf
+    $cmffile = $word:5\.cmf
     $offset = $word:3
     $filter = $word:4
@@ -349 +349 @@
     exec mkcmf -forcedgalaxy -photcode SIMTEST.$filter.ForcedWarp $rawfile $cmffile -extroot SkyChip -date 2008/1/1 -time $i\:00:00 -mjd 54466.0 -radec $RA $DEC -type $1 -imageID $stkID -sourceID 1 -tess_id $TESS_ID -skycell $SKYCELL
 
-    echo loadgalphot -D CATDIR $catdir $cmffile
-    exec loadgalphot -D CATDIR $catdir $cmffile
+    echo loadgalphot -D CATDIR $catdir -photcode SIMTEST.$filter.ForcedWarp -image-id $stkID $cmffile 
+    exec loadgalphot -D CATDIR $catdir -photcode SIMTEST.$filter.ForcedWarp -image-id $stkID $cmffile
   end