Changeset 34041 for branches/meh_branches/ppstack_test/ippToPsps/jython/config.py

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/config.py (modified) (6 diffs)

branches/meh_branches/ppstack_test/ippToPsps/jython/config.py

@@ -8 +8 @@
 
 '''
-A class encapsulating the ippToPsps config file
+A class encapsulating a ippToPsps configuration. This information is stored in the 'config' table
+of the ipptopsps database, but there are some higher level config details in the 'settings.xml' file
 '''
 class Config(object):
@@ -27 +28 @@
         self.settingsDoc = ElementTree(file=self.settingsPath)
         self.logPath = self.settingsDoc.find("logPath").text
-
+        self.czarPlotsPath = self.settingsDoc.find("czarPlotsPath").text
 
         # this is the border (in degrees) that we place around any loading box of 
         # PS1 pointings to ensure we pull a large enough area out of DVO
-        self.BORDER = 1.6
+        self.BORDER = 1.65
         self.isLoaded = False
 
@@ -38 +39 @@
     '''
     def printAll(self):
+
+        self.logger.infoTitle("Config")
 
         try:
@@ -46 +49 @@
             self.logger.infoPair("Loading epoch", self.epoch)
             self.logger.infoPair("Data release", "%d" % self.dataRelease)
-            self.logger.infoBool("Test mode?", self.test)
-            self.logger.infoBool("Forcing?", self.force)
-            self.logger.infoBool("Reporting NULLS?", self.reportNulls)
             for batchType in self.batchTypes: self.logger.infoPair("Queuing batch type", batchType)
         except:
@@ -60 +60 @@
         except: pass
 
+    '''
+    Queuing this batch type?
+    '''
+    def queuingThisBatchType(self, batchType):
+       if batchType in self.batchTypes: return 1
+       return 0
 
     '''
@@ -129 +135 @@
     def getDbPassword(self, dbType): return self.settingsDoc.find(dbType +"/password").text
 
-