Changeset 35235 for branches/eam_branches/ipp-20130207/ippToPsps/jython/metrics.py

Timestamp:

Mar 5, 2013, 2:23:09 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207/ippToPsps

Files:

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

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

@@ -25 +25 @@
     
         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 +37 @@
             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 +77 @@
        
             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 +132 @@
            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