Skip to content

Commit 378b08e

Browse files
author
kleinjohann
committed
Add option to load amplitudes (default False)
1 parent a4a09bc commit 378b08e

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

neo/io/phyio.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ class PhyIO(PhyRawIO, BaseFromRaw):
77
description = "Phy IO"
88
mode = 'dir'
99

10-
def __init__(self, dirname, load_pcs=False):
11-
PhyRawIO.__init__(self, dirname=dirname, load_pcs=load_pcs)
10+
def __init__(self, dirname, load_amplitudes=False, load_pcs=False):
11+
PhyRawIO.__init__(self,
12+
dirname=dirname,
13+
load_amplitudes=load_amplitudes,
14+
load_pcs=load_pcs)
1215
BaseFromRaw.__init__(self, dirname)

neo/rawio/phyrawio.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ class PhyRawIO(BaseRawIO):
3636
extensions = []
3737
rawmode = 'one-dir'
3838

39-
def __init__(self, dirname='', load_pcs=False):
39+
def __init__(self, dirname='', load_amplitudes=False, load_pcs=False):
4040
BaseRawIO.__init__(self)
4141
self.dirname = dirname
4242
self.load_pcs = load_pcs
43+
self.load_amplitudes = load_amplitudes
4344

4445
def _source_name(self):
4546
return self.dirname
@@ -55,10 +56,13 @@ def _parse_header(self):
5556
else:
5657
self._spike_clusters = self._spike_templates
5758

58-
if (phy_folder / 'amplitudes.npy').is_file():
59-
self._amplitudes = np.squeeze(np.load(phy_folder / 'amplitudes.npy'))
60-
else:
61-
self._amplitudes = None
59+
self._amplitudes = None
60+
if self.load_amplitudes:
61+
if (phy_folder / 'amplitudes.npy').is_file():
62+
self._amplitudes = np.squeeze(np.load(phy_folder / 'amplitudes.npy'))
63+
else:
64+
warnings.warn('Amplitudes requested but "amplitudes.npy"'
65+
'not found in the data folder.')
6266

6367
self._pc_features = None
6468
self._pc_feature_ind = None

0 commit comments

Comments
 (0)