From 33f5e3fa717b8101da1330303098c5cdc31ab678 Mon Sep 17 00:00:00 2001 From: David Meunier Date: Tue, 3 Dec 2019 14:09:01 +0100 Subject: [PATCH 1/2] Update README.rst --- README.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e5d4755a..e0d385fe 100644 --- a/README.rst +++ b/README.rst @@ -8,7 +8,10 @@ .. image:: https://circleci.com/gh/neuropycon/ephypype.svg?style=svg :target: https://circleci.com/gh/neuropycon/ephypype - + +.. image:: https://zenodo.org/badge/92522975.svg + :target: https://zenodo.org/badge/latestdoi/92522975 + README ****** From 57cc156fdf87e9d8314c1d0cc7d2684ea471388e Mon Sep 17 00:00:00 2001 From: David Meunier Date: Mon, 16 Dec 2019 14:28:27 +0100 Subject: [PATCH 2/2] Test release + modif HDF5 transpose (#95) * added transpose option for ImportHDF5 * version 0.2 --- ephypype/__init__.py | 2 +- ephypype/import_data.py | 8 ++++++-- ephypype/nodes/import_data.py | 13 ++++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ephypype/__init__.py b/ephypype/__init__.py index 8ef797dc..73e63cff 100644 --- a/ephypype/__init__.py +++ b/ephypype/__init__.py @@ -1,3 +1,3 @@ from . import interfaces # noqa from . import gather # noqa -__version__ = '0.1' +__version__ = '0.2' diff --git a/ephypype/import_data.py b/ephypype/import_data.py index 80811a62..d419983a 100644 --- a/ephypype/import_data.py +++ b/ephypype/import_data.py @@ -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 @@ -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 @@ -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) diff --git a/ephypype/nodes/import_data.py b/ephypype/nodes/import_data.py index be2fcda0..465562eb 100644 --- a/ephypype/nodes/import_data.py +++ b/ephypype/nodes/import_data.py @@ -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""" @@ -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 @@ -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