Added support for NDACC AMES 2160 file variant.

Author: Adam Capparelli

example_files/2160_ndacc.na

@@ -30,7 +30,7 @@ class is sub-classed by all NAFile classes.
                      "NAUXV", "NCOM", "NIV", "NLHEAD", "NNCOML",
                      "NSCOML", "NV", "NVOL", "NVPM", "NX", "NXDEF",
                      "ONAME", "ORG", "RDATE", "SCOM", "SNAME", "V",
-                     "VMISS", "VNAME", "VSCAL", "X", "XNAME")
+                     "VMISS", "VNAME", "VSCAL", "X", "XNAME", "ignored_header_lines")
 
     def __init__(self):
         """

nappy/na_file/na_core.py

@@ -54,7 +54,7 @@ class NAFile(nappy.na_file.na_core.NACore):
     the user forgets to close it.
     """
 
-    def __init__(self, filename, mode="r", na_dict={}): 
+    def __init__(self, filename, ignore_header_lines=0, mode="r", na_dict={}): 
         """
         Initialization of class, decides if user wishes to read or write
         NASA Ames file.
@@ -63,6 +63,8 @@ def __init__(self, filename, mode="r", na_dict={}):
         self.filename = filename
         self._open(mode)
         self.mode = mode
+        self.ignore_header_lines = ignore_header_lines
+        self.ignored_header_lines = []
         self.na_dict = na_dict
 
         if self.mode == "r":

nappy/na_file/na_file.py

@@ -30,7 +30,12 @@ def readHeader(self):
         Reads FFI-specifc header section.
         """
         self._normalized_X = False
+        
+        for i in range(self.ignore_header_lines):
+            self.ignored_header_lines.append(nappy.utils.text_parser.readItemFromLine(self.file.readline()))
+
         self._readCommonHeader()
+        self.NLHEAD+=self.ignore_header_lines
         self.DX = nappy.utils.text_parser.readItemsFromLine(self.file.readline(), 1, float)
         self.LENX = nappy.utils.text_parser.readItemFromLine(self.file.readline(), float)
         self.XNAME = nappy.utils.text_parser.readItemsFromLines(self._readLines(self.NIV), self.NIV, str)
@@ -43,6 +48,10 @@ def writeHeader(self):
         """
         Writes FFI-specific header section.
         """
+        if self.ignored_header_lines:
+            self.file.write("\n".join(self.ignored_header_lines))
+            self.file.write("\n")
+        
         self._writeCommonHeader()
         DX = self.DX
         DX.reverse()
@@ -101,7 +110,7 @@ def _readData1(self, datalines, ivar_count):
         self.X[ivar_count].append(x1[0])
         # Set up list to take second changing independent variable
         self.X[ivar_count].append([])  
-
+        
         # Get NX and Non-character AUX vars
         (aux, datalines) = nappy.utils.text_parser.readItemsFromUnknownLines(datalines, (self.NAUXV - self.NAUXC), float)
         self.NX.append(int(aux[0]))

nappy/na_file/na_file_2160.py

@@ -153,15 +153,15 @@
 default_float_format = nappy.utils.common_utils.getDefault("default_float_format")
 
 
-def openNAFile(filename, mode="r", na_dict=None):
+def openNAFile(filename, mode="r", na_dict=None, ignore_header_lines=0):
     """
     Function wrapper around the NASA Ames File classes. Any NASA Ames
     file can be opened through this function and the appropriate read or
     write NASA Ames File class instance is returned.
     """
     if mode == "r":
-        ffi = readFFI(filename)
-        return apply(getNAFileClass(ffi), (filename, mode))
+        ffi = readFFI(filename, ignore_header_lines)
+        return apply(getNAFileClass(ffi), (filename, ignore_header_lines, mode))
 
     elif mode == "w":
         if na_dict.has_key('FFI') and type(na_dict['FFI']) == type(3):

nappy/nappy_api.py

@@ -31,12 +31,14 @@ def getNAFileClass(ffi):
     return eval("%s.%s" % (mod, cls))
 
 
-def readFFI(filename):
+def readFFI(filename, ignore_header_lines):
     """
     Function to read the top line of a NASA Ames file to extract
     the File Format Index (FFI) and return it as an integer.
     """
     with open(filename) as fin:
+        for i in range(ignore_header_lines):
+            fin.readline()
         topline = fin.readline()
         nextline = fin.readline()
 

nappy/utils/common_utils.py

@@ -22,12 +22,18 @@ class NAFile2160_TestCase(unittest.TestCase):
 
     def setUp(self):
         self.infile = os.path.join(data_files, "2160.na")
+        self.ndacc_infile = os.path.join(data_files, "2160_ndacc.na")
         self.outfile = os.path.join(test_outputs, "test_2160.na")
+        self.ndacc_outfile = os.path.join(test_outputs, "test_2160_ndacc.na")
         self.out_csv = os.path.join(test_outputs, "test_2160.csv")
         self.out_csv_annotated = os.path.join(test_outputs, "test_2160_annotated.csv")
         self.fin = nappy.openNAFile(self.infile)
         self.fin.readData()
-        self.na_dict = self.fin.getNADict()        
+        self.na_dict = self.fin.getNADict()
+        
+        self.ndacc_fin = nappy.openNAFile(self.ndacc_infile, ignore_header_lines=1)
+        self.ndacc_fin.readData()
+        self.ndacc_na_dict = self.ndacc_fin.getNADict()
 
     def test_read2160(self):
         "Tests reading FFI 2160."
@@ -38,6 +44,12 @@ def test_write2160(self):
         fobj = nappy.openNAFile(self.outfile, mode="w", na_dict=self.na_dict)		
         fobj.write()
         self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
+    
+    def test_write_ndacc(self):
+        "Tests writing FFI 2160 NDACC format."
+        fobj = nappy.openNAFile(self.ndacc_outfile, mode="w", na_dict=self.ndacc_na_dict)		
+        fobj.write()
+        self.failUnless(isinstance(fobj, nappy.na_file.na_file.NAFile))
 
     def test_writeCSV2160(self):
         "Tests conversion to CSV."