Merge branch 'develop'

underchemist · Mar 22, 2020 · c2ac4e7 · c2ac4e7
2 parents dfa25fd + 8c41f9e
commit c2ac4e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,8 @@
 language: python
-matrix:
-  include:
-  - name: 3.6 Unit Test
-    python: '3.6'
-  - name: 3.7 Unit Test
-    sudo: required
-    dist: xenial
-    python: '3.7'
-branches:
-  only:
-  - master
-  - develop
+python:
+  - "3.6"
+  - "3.7"
+  - "3.8"
 install:
 - pip install python-coveralls
 - pip install -r requirements.txt

diff --git a/nanonispy/read.py b/nanonispy/read.py
@@ -227,7 +227,7 @@ def _load_data(self):
         exp_size_per_pix = num_param + num_sweep*num_chan
 
         # reshape from 1d to 3d
-        griddata_shaped = griddata.reshape((nx, ny, exp_size_per_pix))
+        griddata_shaped = griddata.reshape((ny, nx, exp_size_per_pix))
 
         # experimental parameters are first num_param of every pixel
         params = griddata_shaped[:, :, :num_param]
@@ -357,7 +357,7 @@ def _load_data(self):
         f.close()
 
         # reshape
-        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):