Changeset 33415 for branches/meh_branches/ppstack_test/ippToPsps/jython/fits.py

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/fits.py (modified) (3 diffs)

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

@@ -15 +15 @@
 
     '''
-    def __init__(self, logger, doc, originalPath):
+    def __init__(self, logger, config, originalPath):
 
        # set class variables
        self.originalPath = originalPath
        self.logger = logger
-       self.doc = doc
-       self.localDir = self.doc.find("localOutPath").text
+       self.config = config
+       self.header = None
 
        # does this file even exist?
@@ -30 +30 @@
        # ok, we have a file, now copy it locally to save on NFS overhead
        self.logger.debugPair("FITS file", self.originalPath)
-       self.localCopyPath = self.localDir + "/temp.fits"
-       shutil.copy2(self.originalPath, self.localCopyPath)
+       #self.localCopyPath = self.config.basePath + "/temp.fits"
+       #shutil.copy2(self.originalPath, self.localCopyPath)
 
        # open the local copy and parse the ridiculou plain-text header
-       self.file = open(self.localCopyPath)
+       #self.file = open(self.localCopyPath)
+       self.file = open(self.originalPath)
        self.header = self.parseHeader()
-       self.logger.debugPair("FITS local copy", self.localCopyPath)
+       #self.logger.debugPair("FITS local copy", self.localCopyPath)
        self.logger.debugPair("FITS primary header", "%d cards found" % len(self.header))
 
@@ -52 +53 @@
     '''
     def getPath(self):
-        return self.localCopyPath
+        #return self.localCopyPath
+        return self.originalPath
 
     '''