Merge branch 'fix_on_memory'

# Conflicts: # ncempy/io/dm.py
ercius · May 29, 2020 · f6df731 · f6df731
2 parents ac1ef41 + b58b095
commit f6df731
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/ncempy/io/dm.py b/ncempy/io/dm.py
@@ -961,6 +961,10 @@ def getDataset(self, index):
                 outputDict['pixelSize'] = self.scale[jj:jj + self.dataShape[ii]][::-1]
                 outputDict['pixelOrigin'] = self.origin[jj:jj + self.dataShape[ii]][::-1]
 
+        # Ensure the data is loaded into memory from the buffer
+        if self._on_memory:
+            outputDict['data'] = np.array(outputDict['data'])
+
         # Remove singular dimensions if present
         outputDict['data'] = np.squeeze(outputDict['data'])
         return outputDict