Changeset 32587

Timestamp:

Oct 28, 2011, 11:38:48 AM (15 years ago)

Author:

rhenders

Message:

Now makes an estimate of remaining time required to complete processing of each batch type

File:

• trunk/ippToPsps/jython/metrics.py (modified) (6 diffs)

trunk/ippToPsps/jython/metrics.py

@@ -76 +76 @@
        numPending = len(pending)
 
-       #if stage == 'processed':
+       #if stage == 'merge_worthy' and batchType == "P2":
        #    for n in pending: print n
 
@@ -85 +85 @@
        print >> DATFILE, stage, numSuccess, numFail, numPending
 
+       if stage == 'processed': numPendingProcessed = numPending
+
     sys.stdout.write("|\n")
     plotMe(batchType, tempFilename)
     DATFILE.close()
+
+    return numPendingProcessed
 
 '''
@@ -103 +107 @@
 def printStats(batchType):
 
+    rate = ippToPspsDb.countBatchesInLastPeriod(batchType, EPOCH, DVOLABEL, "1 HOUR") / 1.0 
+
     logger.info("| %2s | %16.1f | %13d | %17.1f | %16d | %14s |" % 
             (batchType,
-             ippToPspsDb.countBatchesInLastPeriod(batchType, EPOCH, DVOLABEL, "1 HOUR") / 1.0,
+             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
 
 '''
@@ -137 +145 @@
 
 DVOLABEL = configDoc.find("dvo/gpc1Label").text
-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)
-except:
-    pass
-   
 EPOCH = configDoc.find("options/epoch").text
 
@@ -152 +152 @@
 logger.infoPair("DVO label", 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("+----+------------------+---------------+-------------------+------------------+----------------+")
-printStats("P2")
-printStats("ST")
+rateP2 = printStats("P2")
+rateST = printStats("ST")
 logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")
 
@@ -171 +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