Index: /trunk/ippToPsps/config/settings.xml
===================================================================
--- /trunk/ippToPsps/config/settings.xml (revision 35216)
+++ /trunk/ippToPsps/config/settings.xml (revision 35217)
@@ -86,5 +86,13 @@
-
+
+
+ gpc1
+ ippdb01
+ ipp
+ ipp
+
+
+
@@ -105,5 +113,5 @@
czardb
- none
+ ippdb01
ipp
ipp
Index: /trunk/ippToPsps/jython/config.py
===================================================================
--- /trunk/ippToPsps/jython/config.py (revision 35216)
+++ /trunk/ippToPsps/jython/config.py (revision 35217)
@@ -58,4 +58,7 @@
self.settingsDoc = ElementTree(file=self.settingsPath)
self.logPath = self.settingsDoc.find("logPath").text
+ self.czarPlotsPath = self.settingsDoc.find("czarPlotsPath").text
+
+
print "config.programName: ", self.programName
@@ -64,4 +67,5 @@
print "config.logPath: ", self.logPath
print "config.test: ", self.test
+ print "config.czarPlotsPath: ", self.czarPlotsPath
root = self.settingsDoc.getroot()
Index: /trunk/ippToPsps/jython/dvo.py
===================================================================
--- /trunk/ippToPsps/jython/dvo.py (revision 35216)
+++ /trunk/ippToPsps/jython/dvo.py (revision 35217)
@@ -6,4 +6,5 @@
import sys
import os
+import math
import logging
import glob
Index: /trunk/ippToPsps/jython/dxlayer.py
===================================================================
--- /trunk/ippToPsps/jython/dxlayer.py (revision 35216)
+++ /trunk/ippToPsps/jython/dxlayer.py (revision 35217)
@@ -30,5 +30,5 @@
tempFile = tempfile.NamedTemporaryFile(mode='w+b')
- p = Popen("../perl/deleteFromDXLayer.pl -b " + batch + " -f " + tempFile.name,
+ p = Popen("deleteFromDXLayer.pl -b " + batch + " -f " + tempFile.name,
shell=True,
stdout=PIPE)
Index: /trunk/ippToPsps/jython/ipptopspsdb.py
===================================================================
--- /trunk/ippToPsps/jython/ipptopspsdb.py (revision 35216)
+++ /trunk/ippToPsps/jython/ipptopspsdb.py (revision 35217)
@@ -1214,9 +1214,13 @@
self.logger.errorPair("No outstanding boxes to steal", "no stripe obtained")
+ # tests against ra_center need to use a finite box
+ minRA = raCenter - 0.01
+ maxRA = raCenter + 0.01
+
self.logger.infoPair("Using RA stripe", "%f" % raCenter)
sql = "SELECT DISTINCT id \
FROM box \
JOIN pending ON (id = box_id) \
- WHERE ra_center = " + str(raCenter) + " \
+ WHERE ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
AND batch_type = '" + batchType + "' \
AND skychunk = '" + self.skychunk.name + "' \
@@ -1280,9 +1284,13 @@
self.logger.errorPair("No outstanding boxes to steal", "no stripe obtained")
+ # tests against ra_center need to use a finite box
+ minRA = raCenter - 0.01
+ maxRA = raCenter + 0.01
+
self.logger.infoPair("Using RA stripe", "%f" % raCenter)
sql = "SELECT DISTINCT id \
FROM box \
JOIN pending ON (id = box_id) \
- WHERE ra_center = " + str(raCenter) + " \
+ WHERE ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
AND skychunk = '" + self.skychunk.name + "' \
ORDER BY dec_center DESC"
Index: /trunk/ippToPsps/jython/metrics.py
===================================================================
--- /trunk/ippToPsps/jython/metrics.py (revision 35216)
+++ /trunk/ippToPsps/jython/metrics.py (revision 35217)
@@ -25,5 +25,5 @@
self.czarDb = CzarDb(self.logger, self.config)
- self.plot = Plot(self.logger, self.config, self.ippToPspsDb)
+ self.plot = Plot(self.logger, self.skychunk, self.config, self.ippToPspsDb)
'''
@@ -37,8 +37,8 @@
now = datetime.datetime.now()
self.logger.infoPair("Time now", now.strftime("%Y-%m-%d %H:%M:%S"))
- self.logger.infoPair("Config", self.config.name)
- self.logger.infoPair("Loading epoch", self.config.epoch)
- self.logger.infoPair("DVO label", self.config.dvoLabel)
- self.config.printBoxCoords()
+ self.logger.infoPair("Config", self.skychunk.name)
+ self.logger.infoPair("Loading epoch", self.skychunk.epoch)
+ self.logger.infoPair("DVO label", self.skychunk.dvoLabel)
+ self.skychunk.printBoxCoords()
self.logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
@@ -77,10 +77,10 @@
self.checkClientStatus()
-
+ self.logger.infoPair("here","yay")
# create a density plot of pending stuff for czartool
self.plot.createDensityPlot("P2", True)
self.plot.createDensityPlot("ST", True)
self.plot.createDensityPlot("OB", True)
-
+ self.logger.infoPair("here","yay2")
# some clean-up before going to sleep
self.ippToPspsDb.purgeDeadClients()
@@ -132,5 +132,5 @@
prevList = success
- self.czarDb.insertStats(stage, self.config.name, batchType, numPending, numSuccess, numFail)
+ self.czarDb.insertStats(stage, self.skychunk.name, batchType, numPending, numSuccess, numFail)
if stage == 'processed': numPendingProcessed = numPending
Index: /trunk/ippToPsps/jython/odm.py
===================================================================
--- /trunk/ippToPsps/jython/odm.py (revision 35216)
+++ /trunk/ippToPsps/jython/odm.py (revision 35217)
@@ -32,5 +32,5 @@
tempFile = tempfile.NamedTemporaryFile(mode='w+b')
- p = Popen("../perl/checkOdmStatus.pl -b " + batch + " -f " + tempFile.name,
+ p = Popen("checkOdmStatus.pl -b " + batch + " -f " + tempFile.name,
shell=True,
stdout=PIPE,
Index: /trunk/ippToPsps/jython/plot.py
===================================================================
--- /trunk/ippToPsps/jython/plot.py (revision 35216)
+++ /trunk/ippToPsps/jython/plot.py (revision 35217)
@@ -15,8 +15,9 @@
Constructor
'''
- def __init__(self, logger, skychunk, ippToPspsDb):
+ def __init__(self, logger, skychunk, config, ippToPspsDb):
self.logger = logger
self.skychunk = skychunk
+ self.config = config
self.ippToPspsDb = ippToPspsDb
@@ -25,27 +26,26 @@
'''
def createDensityPlot(self, batchType, forCzartool=False):
-
+
tempFilename = "./" + self.skychunk.name + "_" + batchType + "_plotData.dat"
DATFILE = open(tempFilename,'w')
max = self.ippToPspsDb.createPendingDensityPlotData(batchType, DATFILE)
DATFILE.close()
-
if max == 0: max = 1
timestamp = time.strftime('%Y_%m%d_%H%M%S')
-
+
if forCzartool:
## XXX from config??
- OUTPUTFILE = self.skychunk.czarPlotsPath + "/ippToPsps_density_" + self.skychunk.name + "_" + batchType + ".png"
+ OUTPUTFILE = self.config.czarPlotsPath + "/ippToPsps_density_" + self.skychunk.name + "_" + batchType + ".png"
else:
OUTPUTFILE = self.skychunk.name + "_" + batchType + "_" + timestamp + ".png"
-
+
f = os.popen('/home/panstarrs/ipp/local/bin/gnuplot', 'w')
-
+
if 0:
TERM = "X11"
else:
TERM = "png font \"/usr/share/fonts/corefonts/arial.ttf\" 8"
-
+ print "output to : "+ OUTPUTFILE
print >> f, "set term " + TERM + "; \
set output \"" + OUTPUTFILE + "\"; \
@@ -57,5 +57,5 @@
set palette rgb 22,13,10; \
set ylabel \"Dec\"; \
- set ylabel \"RA\"; \
+ set xlabel \"RA\"; \
set cbrange [0:" + str(max) + "]; \
set datafile missing \"NaN\"; \
Index: /trunk/ippToPsps/jython/plotter.py
===================================================================
--- /trunk/ippToPsps/jython/plotter.py (revision 35216)
+++ /trunk/ippToPsps/jython/plotter.py (revision 35217)
@@ -18,5 +18,5 @@
super(Plotter, self).__init__(argv)
- self.plot = Plot(self.logger, self.skychunk, self.ippToPspsDb)
+ self.plot = Plot(self.logger, self.skychunk, self.config, self.ippToPspsDb)
if len(argv) < 3:
Index: /trunk/ippToPsps/jython/queue.py
===================================================================
--- /trunk/ippToPsps/jython/queue.py (revision 35216)
+++ /trunk/ippToPsps/jython/queue.py (revision 35217)
@@ -57,6 +57,6 @@
for batchType in self.skychunk.batchTypes:
- self.logger.infoTitle("Previous failed datastore loads")
- self.publishAnyUnpublishedBatches(batchType)
+ # self.logger.infoTitle("Previous failed datastore loads")
+ # self.publishAnyUnpublishedBatches(batchType)
# get totals for whole area to check if there is anything to do