Skip to content

Commit

Permalink
Test release + modif HDF5 transpose (#95)
Browse files Browse the repository at this point in the history
* added transpose option for ImportHDF5

* version 0.2
  • Loading branch information
davidmeunier79 authored and annapasca committed Dec 16, 2019
1 parent 33f5e3f commit 57cc156
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ephypype/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from . import interfaces # noqa
from . import gather # noqa
__version__ = '0.1'
__version__ = '0.2'
8 changes: 6 additions & 2 deletions ephypype/import_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def write_hdf5(filename, data, dataset_name='dataset', dtype='f'):
hf.close()


def _read_hdf5(filename, dataset_name='dataset'):
def _read_hdf5(filename, dataset_name='dataset', transpose=False):

"""
Read hdf5 file
Expand All @@ -58,7 +58,8 @@ def _read_hdf5(filename, dataset_name='dataset'):
hdf5 filename
dataset_name : str
name of dataset to create
transpose: bool
if the data needs to be transpose or not
Outputs
data : array, shape (n_vertices, n_times)
raw data for whose the dataset is created
Expand All @@ -67,6 +68,9 @@ def _read_hdf5(filename, dataset_name='dataset'):
hf = h5py.File(filename, 'r')
data = hf[dataset_name][()]

if transpose:
data = np.transpose(data)

old_path, basename, ext = split_f(filename)
npy_filename = os.path.abspath(basename + '.npy')
print(npy_filename)
Expand Down
13 changes: 12 additions & 1 deletion ephypype/nodes/import_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ class ImportHdf5InputSpec(BaseInterfaceInputSpec):
data_field_name = traits.String('dataset', desc='Name of dataset',
usedefault=True)

transpose = traits.Bool(
False, usedefault=True,
desc="If the matlab data have to be transposed once read")


class ImportHdf5OutputSpec(TraitedSpec):
"""Output spec for ImportHdf5"""
Expand All @@ -113,6 +117,11 @@ class ImportHdf5(BaseInterface):
data_field_name : string
Name of the dataset
transpose:
type = Bool
default = False, usedefault = True,
desc = "If the matlab data have to be transposed once read")
Outputs
-------
ts_file : str
Expand All @@ -126,7 +135,9 @@ def _run_interface(self, runtime):

ts_hdf5_file = self.inputs.ts_hdf5_file
data_field_name = self.inputs.data_field_name
self.ts_file = _read_hdf5(ts_hdf5_file, dataset_name=data_field_name)

self.ts_file = _read_hdf5(ts_hdf5_file, dataset_name=data_field_name,
transpose=self.inputs.transpose)

return runtime

Expand Down

0 comments on commit 57cc156

Please sign in to comment.