Changeset 32630 for branches/eam_branches/ipp-20110906/ippToPsps/jython/metrics.py

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• ippToPsps/jython/metrics.py (modified) (7 diffs)

branches/eam_branches/ipp-20110906/ippToPsps/jython/metrics.py

@@ -52 +52 @@
 
     # get a master list of IDs in DVO for this batch type
-    allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOLABEL, batchType)
+    if MINRA and MAXRA and MINDEC and MAXDEC:
+        allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOLABEL, batchType, MINRA, MAXRA, MINDEC, MAXDEC)
+    else:
+        allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOLABEL, batchType)
     prevList = allIDs
     numEverything = len(allIDs)
@@ -73 +76 @@
        numPending = len(pending)
 
+       #if stage == 'merge_worthy' and batchType == "P2":
+       #    for n in pending: print n
+
        str = "\033[1;34m%5s\033[1;m \033[1;32m%5s\033[1;m \033[1;31m%5s\033[1;m  " % (getIntAsString(numPending), getIntAsString(numSuccess), getIntAsString(numFail))
        sys.stdout.write("|%-19s" % str)
@@ -79 +85 @@
        print >> DATFILE, stage, numSuccess, numFail, numPending
 
+       if stage == 'processed': numPendingProcessed = numPending
+
     sys.stdout.write("|\n")
     plotMe(batchType, tempFilename)
     DATFILE.close()
+
+    return numPendingProcessed
 
 '''
@@ -91 +101 @@
     for i in range(0, colCount): sys.stdout.write("+-------------------")
     sys.stdout.write("+\n")
+
+'''
+Prints various timing stats for this batch type
+'''
+def printStats(batchType):
+
+    rate = ippToPspsDb.countBatchesInLastPeriod(batchType, EPOCH, DVOLABEL, "1 HOUR") / 1.0 
+
+    logger.info("| %2s | %16.1f | %13d | %17.1f | %16d | %14s |" % 
+            (batchType,
+             rate,
+             ippToPspsDb.countBatchesInLastPeriod(batchType, EPOCH, DVOLABEL, "24 HOUR"),
+             ippToPspsDb.countBatchesInLastPeriod(batchType, EPOCH, DVOLABEL, "1 WEEK") / 7.0, 
+             ippToPspsDb.getTotalDetectionsPublished(batchType, EPOCH, DVOLABEL),
+             ippToPspsDb.getTimeOfLastBatchPublished(batchType, EPOCH, DVOLABEL)))
+
+    return rate
 
 '''
@@ -112 +139 @@
 gpc1Db = Gpc1Db(logger, configDoc)
 
+MINRA = None
+MAXRA = None
+MINDEC = None
+MAXDEC = None
+
 DVOLABEL = configDoc.find("dvo/gpc1Label").text
 EPOCH = configDoc.find("options/epoch").text
@@ -119 +151 @@
 logger.infoPair("Loading epoch", EPOCH)
 logger.infoPair("DVO label", DVOLABEL)
-logger.infoPair("P2 batches per hour", "%.1f" % ippToPspsDb.getBatchesPerHour("P2", EPOCH, DVOLABEL, 2))
-logger.infoPair("ST batches per hour", "%.1f" % ippToPspsDb.getBatchesPerHour("ST", EPOCH, DVOLABEL, 2))
-logger.infoPair("Last P2 batch published", ippToPspsDb.getTimeOfLastBatchPublished("P2", EPOCH, DVOLABEL))
-logger.infoPair("Last ST batch published", ippToPspsDb.getTimeOfLastBatchPublished("ST", EPOCH, DVOLABEL))
+
+try:
+    MINRA = float(configDoc.find("dvo/minRA").text)
+    MAXRA = float(configDoc.find("dvo/maxRA").text)
+    MINDEC = float(configDoc.find("dvo/minDec").text)
+    MAXDEC = float(configDoc.find("dvo/maxDec").text)
+    logger.infoPair("Coordinates", "%.1f to %.1f RA, %.1f to %.1f Dec" % (MINRA, MAXRA, MINDEC, MAXDEC))
+except:
+    pass
+   
+
+logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
+logger.info("|Type| batches per hour | last 24 hours | per day this week | total detections | last published |")
+logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
+rateP2 = printStats("P2")
+rateST = printStats("ST")
+logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
+
 logger.info("")
 
@@ -135 +181 @@
 sys.stdout.write("|\n")
 writetableSeparator(colCount)
-printTableRow(stages, "P2")
-printTableRow(stages, "ST")
+pendP2Processed = printTableRow(stages, "P2")
+pendSTProcessed = printTableRow(stages, "ST")
 writetableSeparator(colCount)
 
+logger.info("")
+try: logger.infoPair("Estimated time for P2s", "%.1f hours" % (pendP2Processed / rateP2)) 
+except: pass
+try: logger.infoPair("Estimated time for STs", "%.1f hours" % (pendSTProcessed / rateST)) 
+except: pass