Loading pysen/inout/hdf.py +7 −4 Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ File type translators Convert .echo to HDF5 """ import os.path import tempfile import logging # import h5py Loading Loading @@ -184,13 +185,15 @@ class HdfConverter: return subgroup, subkey def read_nexus_echo(filename, outdir='.'): def read_nexus_echo(filename): "read nexus echo file" echo = EchoWriter() if not echo.read_nexus(filename): raise RuntimeError("Error reading NeXus file {filename}") echofile = echo.save(outdir) return read_echo(echofile) with tempfile.TemporaryDirectory() as tmpdir: echofile = echo.save(tmpdir) echodata = read_echo(echofile) return echodata # CONVERTER DATA_READER = { 'application/taco-nse-echo' : read_echo, Loading Loading @@ -234,7 +237,7 @@ def convert_to_hdf(filename, outdir, **kwargs): reader = DATA_READER.get(data_type) if reader is None: raise RuntimeError(f"Don't know how to handle {file_type} file") converter.data = reader(filename, outdir=outdir) converter.data = reader(filename) converter.write(outfile, mode=mode, compression=compression) return outfile Loading pysen/inout/reader.py +3 −3 Original line number Diff line number Diff line Loading @@ -457,7 +457,7 @@ def read_echo_data(fdesc, newshape, **kwargs): logging.getLogger().debug('read echo data (maxcount=%d)', np.max(result.get('detector',0))) return result def read_echo(filename, **_kwargs): def read_echo(filename): """ Read echo file """ Loading Loading @@ -719,7 +719,7 @@ def read_xyz_info(fdesc): logging.getLogger().debug('ok') return result def read_xyz(filename, **_kwargs): def read_xyz(filename): "read xyz analysis .xyz file" result = OrderedDict() _log = logging.getLogger() Loading Loading @@ -753,7 +753,7 @@ def read_xyz(filename, **_kwargs): result['data'] = data return result def read_magnetic(filename, **_kwargs): def read_magnetic(filename): "read magnetic up/down .dat file" result = OrderedDict() Loading pysen/revision.py +2 −2 Original line number Diff line number Diff line Loading @@ -3,8 +3,8 @@ PySEN revision module """ import sys __version__ = "2.1" __release__ = "b5" __date__ = "Apr 15, 2025" __release__ = "b6" __date__ = "Apr 17, 2025" def version(full=False): "get pysen version number" Loading Loading
pysen/inout/hdf.py +7 −4 Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ File type translators Convert .echo to HDF5 """ import os.path import tempfile import logging # import h5py Loading Loading @@ -184,13 +185,15 @@ class HdfConverter: return subgroup, subkey def read_nexus_echo(filename, outdir='.'): def read_nexus_echo(filename): "read nexus echo file" echo = EchoWriter() if not echo.read_nexus(filename): raise RuntimeError("Error reading NeXus file {filename}") echofile = echo.save(outdir) return read_echo(echofile) with tempfile.TemporaryDirectory() as tmpdir: echofile = echo.save(tmpdir) echodata = read_echo(echofile) return echodata # CONVERTER DATA_READER = { 'application/taco-nse-echo' : read_echo, Loading Loading @@ -234,7 +237,7 @@ def convert_to_hdf(filename, outdir, **kwargs): reader = DATA_READER.get(data_type) if reader is None: raise RuntimeError(f"Don't know how to handle {file_type} file") converter.data = reader(filename, outdir=outdir) converter.data = reader(filename) converter.write(outfile, mode=mode, compression=compression) return outfile Loading
pysen/inout/reader.py +3 −3 Original line number Diff line number Diff line Loading @@ -457,7 +457,7 @@ def read_echo_data(fdesc, newshape, **kwargs): logging.getLogger().debug('read echo data (maxcount=%d)', np.max(result.get('detector',0))) return result def read_echo(filename, **_kwargs): def read_echo(filename): """ Read echo file """ Loading Loading @@ -719,7 +719,7 @@ def read_xyz_info(fdesc): logging.getLogger().debug('ok') return result def read_xyz(filename, **_kwargs): def read_xyz(filename): "read xyz analysis .xyz file" result = OrderedDict() _log = logging.getLogger() Loading Loading @@ -753,7 +753,7 @@ def read_xyz(filename, **_kwargs): result['data'] = data return result def read_magnetic(filename, **_kwargs): def read_magnetic(filename): "read magnetic up/down .dat file" result = OrderedDict() Loading
pysen/revision.py +2 −2 Original line number Diff line number Diff line Loading @@ -3,8 +3,8 @@ PySEN revision module """ import sys __version__ = "2.1" __release__ = "b5" __date__ = "Apr 15, 2025" __release__ = "b6" __date__ = "Apr 17, 2025" def version(full=False): "get pysen version number" Loading