diff --git a/CHANGELOG.md b/CHANGELOG.md index cb42cea..e5a277a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ This document contains the Spec2nii release history in reverse chronological order. +0.6.3 (Monday 6th February 2023) +-------------------------------- +- Added handling for GE presscsi and probe-s sequences. + 0.6.2 (Sunday 5th February 2023) ---------------------------------- - Handle HYPER references in SPAR/SDAT pipeline diff --git a/spec2nii/GE/ge_pfile.py b/spec2nii/GE/ge_pfile.py index 7ae8c95..53e6da4 100644 --- a/spec2nii/GE/ge_pfile.py +++ b/spec2nii/GE/ge_pfile.py @@ -91,7 +91,7 @@ def _process_svs_pfile(pfile): ''' psd = pfile.hdr.rhi_psdname.decode('utf-8').lower() - if psd == 'probe-p': + if psd in ('probe-p', 'probe-s'): data, meta, dwelltime, fname_suffix = _process_probe_p(pfile) elif psd in ('oslaser', 'slaser_cni'): data, meta, dwelltime, fname_suffix = _process_oslaser(pfile) @@ -206,9 +206,10 @@ def _process_mrsi_pfile(pfile): ''' psd = pfile.hdr.rhi_psdname.decode('utf-8').lower() - if psd not in ('probe-p', 'probe-sl', 'slaser_cni'): + known_formats = ('probe-p', 'probe-sl', 'slaser_cni', 'presscsi') + if psd not in known_formats: raise UnsupportedPulseSequenceError( - f'Unrecognised sequence {psd}, psdname must be "probe-p", "probe-sl", or "slaser_cni".') + f"Unrecognised sequence {psd}, psdname must be in: {','.join(known_formats)}.") warn('The interpretation of pfile CSI data is poorly tested; rotations or transpositions of the' ' CSI grid could be present. Spec2nii currently lacks a complete set of CSI test data.' diff --git a/spec2nii/GE/ge_read_pfile.py b/spec2nii/GE/ge_read_pfile.py index 785b2a3..534af05 100644 --- a/spec2nii/GE/ge_read_pfile.py +++ b/spec2nii/GE/ge_read_pfile.py @@ -178,7 +178,7 @@ def get_mapper(self): psd = self.hdr.rhi_psdname.decode('utf-8').lower() - if psd == 'probe-p': + if psd in ('probe-p', 'probe-s'): mapper = PfileMapper elif psd in ('oslaser', 'slaser_cni'): mapper = PfileMapperSlaser