Merge a6439b6 into 3f10a3f

nanonispy/read.py

@@ -112,6 +112,9 @@ def start_byte(self):
 
             for line in f:
                 # Convert from bytes to str
+                #entry = line.strip().decode()
+                entry = line.strip().decode('utf-8', 'ignore')
+
                 try:
                     entry = line.strip().decode()
                 except UnicodeDecodeError:
@@ -210,6 +213,11 @@ def _load_data(self):
 
         # pixel size in bytes
         exp_size_per_pix = num_param + num_sweep*num_chan
+
+        ## pad griddata if incomplete
+        if len(griddata) < nx * ny * exp_size_per_pix:
+            paddiff = nx * ny * exp_size_per_pix - len(griddata)
+            griddata = np.pad(griddata, (0, paddiff), 'constant')
 
         # reshape from 1d to 3d
         griddata_shaped = griddata.reshape((nx, ny, exp_size_per_pix))
@@ -340,7 +348,8 @@ def _load_data(self):
         f.close()
 
         # reshape
-        scandata_shaped = scandata.reshape(nchanns, ndir, nx, ny)
+#        scandata_shaped = scandata.reshape(nchanns, ndir, nx, ny)
+        scandata_shaped = scandata.reshape(nchanns, ndir, ny, nx)
 
         # extract data for each channel
         for i, chann in enumerate(channs):
@@ -401,7 +410,13 @@ def _load_data(self):
 
         column_names = f.readline().strip('\n').split('\t')
         f.close()
-        header_lines = len(self.header) + 4
+
+        f = open(self.fname, 'r')
+        ff = f.readlines()
+        header_lines = ff.index('[DATA]\n') + 2
+        f.close()
+
+        # header_lines = len(self.header) + 4
         specdata = np.genfromtxt(self.fname, delimiter='\t', skip_header=header_lines)
 
         for i, name in enumerate(column_names):