Changeset 31305

Timestamp:

Apr 15, 2011, 4:54:57 PM (15 years ago)

Author:

rhenders

Message:

changes to the way survey IDs and dvo databases are handled

File:

• trunk/ippToPsps/jython/batch.py (modified) (3 diffs)

trunk/ippToPsps/jython/batch.py

@@ -73 +73 @@
    
             # get dvo info from config
-            dvoName = doc.find(survey+"dvo/name").text
-            self.dvoLocation = doc.find(survey+"dvo/location").text
+            dvoName = doc.find("dvo_"+survey+"/name").text
+            self.dvoLocation = doc.find("dvo_"+survey+"/location").text
         else:
             dvoName = ""
@@ -105 +105 @@
             file = open(self.inputFitsPath)
             self.header = self.parseFitsHeader(file)
+            self.logger.info("Read primary and found " + str(len(self.header)) + " header cards") 
             # TODO close file?
 
         # create DVO table
         self.createDvoTable()
-        header = self.findAndReadFITSHeader("XY86.hdr")
 
     '''
@@ -251 +251 @@
             return "NA" 
 
-        if self.survey == "ThreePi": return "3PI"
+        if self.survey == "3PI": return "3PI"
         elif self.survey == "MD04": return "MD4"
         else: