Merge pull request #529 from jgrewe/data_array_slice

Data array slice

Author: mpsonntag

nixio/data_array.py

@@ -16,7 +16,7 @@
 from .entity import Entity
 from .source_link_container import SourceLinkContainer
 from .datatype import DataType
-from .dimensions import (Dimension, SampledDimension, RangeDimension,
+from .dimensions import (Dimension, IndexMode, SampledDimension, RangeDimension,
                          SetDimension, DimensionType, DimensionContainer)
 from . import util
 from .compression import Compression
@@ -362,7 +362,7 @@ def _get_slice_bydim(self, positions, extents):
         for dim, pos, ext in zip(self.dimensions, positions, extents):
             if dim.dimension_type in (DimensionType.Sample,
                                       DimensionType.Range):
-                dpos.append(dim.index_of(pos))
+                dpos.append(dim.index_of(pos, mode=IndexMode.GreaterOrEqual))
                 dext.append(dim.index_of(pos + ext) - dpos[-1])
             elif dim.dimension_type == DimensionType.Set:
                 dpos.append(int(pos))

nixio/test/test_data_array.py

@@ -415,6 +415,9 @@ def test_get_slice(self):
         dslice = da2d.get_slice((12.0, 1), (4.0, 1),
                                 mode=nix.DataSliceMode.Data)
         np.testing.assert_almost_equal(data, dslice)
+        dslice2 = da2d.get_slice((0.0, 1), (16.0, 1),
+                                mode=nix.DataSliceMode.Data)
+        np.testing.assert_almost_equal(da2d[0:30, 1:2], dslice2)
 
         data3d = np.random.random_sample((30, 30, 5))
         da3d = self.block.create_data_array("get_slice 3d", "Data",