Changeset 35097 for trunk/ippToPsps/jython/plot.py

Timestamp:

Feb 6, 2013, 3:16:35 PM (13 years ago)

Author:

eugene

Message:

upgrade to ippToPsps (see doc/upgrade.txt): adds native dvo to mysql ingest operations, adds autogen configuration & installation, splits out global config information from new "skychunk" information (current region on the sky being processed), adds test suites

Location:

trunk/ippToPsps

Files:

• . (modified) (1 prop)
• jython (modified) (1 prop)
• jython/plot.py (modified) (3 diffs)

trunk/ippToPsps/jython

@@ -1 +1 @@
 *.class
+Makefile
+Makefile.in

@@ -1 +1 @@
 *.class
+Makefile
+Makefile.in

trunk/ippToPsps/jython/plot.py

@@ -15 +15 @@
     Constructor
     '''
-    def __init__(self, logger, config, ippToPspsDb):
+    def __init__(self, logger, skychunk, ippToPspsDb):
 
         self.logger = logger
-        self.config = config 
+        self.skychunk = skychunk 
         self.ippToPspsDb = ippToPspsDb
 
     '''
-    Creates a density plot of pending exposures for this config
+    Creates a density plot of pending exposures for this skychunk
     '''
     def createDensityPlot(self, batchType, forCzartool=False):
 
-        tempFilename = "./" + self.config.name + "_" + batchType + "_plotData.dat"
+        tempFilename = "./" + self.skychunk.name + "_" + batchType + "_plotData.dat"
         DATFILE = open(tempFilename,'w')
         max = self.ippToPspsDb.createPendingDensityPlotData(batchType, DATFILE)
@@ -36 +36 @@
 
         if forCzartool:
-            OUTPUTFILE = self.config.czarPlotsPath + "/ippToPsps_density_" + self.config.name + "_" + batchType + ".png"
+            ## XXX from config??
+            OUTPUTFILE = self.skychunk.czarPlotsPath + "/ippToPsps_density_" + self.skychunk.name + "_" + batchType + ".png"
         else:
-            OUTPUTFILE = self.config.name + "_" + batchType + "_" + timestamp + ".png"
+            OUTPUTFILE = self.skychunk.name + "_" + batchType + "_" + timestamp + ".png"
 
         f = os.popen('/home/panstarrs/ipp/local/bin/gnuplot', 'w')
@@ -49 +50 @@
         print >> f, "set term " + TERM + "; \
             set output \"" + OUTPUTFILE + "\"; \
-            set title \"Unprocessed " + batchType + " items for '" + self.config.name + "' as of " + timestamp + "\"; \
+            set title \"Unprocessed " + batchType + " items for '" + self.skychunk.name + "' as of " + timestamp + "\"; \
             set grid; \
-            set xrange [" + str(self.config.minRa) + ":" + str(self.config.maxRa) + "] reverse; \
-            set yrange [" + str(self.config.minDec) + ":" + str(self.config.maxDec) + "]; \
+            set xrange [" + str(self.skychunk.minRa) + ":" + str(self.skychunk.maxRa) + "] reverse; \
+            set yrange [" + str(self.skychunk.minDec) + ":" + str(self.skychunk.maxDec) + "]; \
             unset key; \
             set palette rgb 22,13,10; \

@@ -1 +1 @@
 *.class
+Makefile
+Makefile.in