dsf

icartt/dataset.py

@@ -87,10 +87,11 @@ class Data_2110(Data_1001):
         while cur < len(raw):
             self.ivar.append_value_from_string_ivar(raw[cur][0])
             nul = [ var.append_value_from_string_ibvar(raw[cur][0], raw[cur][i+1]) for i, var in enumerate(self.auxvar) ]
-            nprimary = int(self.auxvar[0][-0][1])
+            nprimary = int(self.auxvar[0][-1][1])
             for i in range(nprimary):
-                self.ibvar.append_value_from_string_ibvar(raw[cur][0], raw[i+1][0])
-                nul = [ var.append_value_from_string(raw[cur][0], raw[i+1][0], raw[i+1][j+1]) for j, var in enumerate(self.dvar) ]
+#                import pdb; pdb.set_trace()
+                self.ibvar.append_value_from_string_ibvar(raw[cur][0], raw[cur+i+1][0])
+                nul = [ var.append_value_from_string(raw[cur][0], raw[cur+i+1][0], raw[cur+i+1][j+1]) for j, var in enumerate(self.dvar) ]
             cur += 1 + nprimary
     
     def __init__(self, raw=[], ivar=None, ibvar=None, auxvar=None, dvar=None):
@@ -358,13 +359,13 @@ class Dataset:
             self.version = dmp[2]
         
         assert self.format in IMPLEMENTED_FORMATS, "ICARTT format {:d} not implemented".format(self.format)
-
+        
         # line 2 - PI last name, first name/initial.
         self.PI = f.readline(do_split=False)
-
+        
         # line 3 - Organization/affiliation of PI.
         self.organization = f.readline(do_split=False)
-
+        
         # line 4 - Data source description (e.g., instrument name, platform name,
         # model name, etc.).
         self.dataSource = f.readline(do_split=False)
@@ -378,7 +379,7 @@ class Dataset:
         dmp = f.readline()
         self.volume   = int(dmp[0])
         self.nvolumes = int(dmp[1])
-
+        
         # line 7 - UTC date when data begin, UTC date of data reduction or revision
         # - comma delimited (yyyy, mm, dd, yyyy, mm, dd).
         dmp = f.readline()