Skip to content

Commit 0223f6d

Browse files
committed
hotfix: fix issue with lims passing vcn stim table instead of newer one
1 parent 56354b1 commit 0223f6d

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

allensdk/brain_observatory/ecephys/current_source_density/__main__.py

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,23 @@
1111

1212
from typing import Optional
1313

14-
from ._schemas import InputParameters, OutputParameters
15-
from ._current_source_density import (
16-
accumulate_lfp_data,
17-
compute_csd,
18-
extract_trial_windows
19-
)
20-
from ._filter_utils import filter_lfp_channels, select_good_channels
21-
from ._interpolation_utils import (
22-
interp_channel_locs,
23-
make_actual_channel_locations,
24-
make_interp_channel_locations
25-
)
14+
from allensdk.brain_observatory.ecephys.current_source_density._schemas \
15+
import \
16+
InputParameters, OutputParameters
17+
from allensdk.brain_observatory.ecephys.current_source_density.\
18+
_current_source_density import (
19+
accumulate_lfp_data,
20+
compute_csd,
21+
extract_trial_windows
22+
)
23+
from allensdk.brain_observatory.ecephys.current_source_density._filter_utils \
24+
import filter_lfp_channels, select_good_channels
25+
from allensdk.brain_observatory.ecephys.current_source_density\
26+
._interpolation_utils import (
27+
interp_channel_locs,
28+
make_actual_channel_locations,
29+
make_interp_channel_locations
30+
)
2631
from allensdk.brain_observatory.ecephys.file_io.continuous_file import (
2732
ContinuousFile
2833
)
@@ -75,6 +80,13 @@ def run_csd(args: dict) -> dict:
7580

7681
stimulus_table = pd.read_csv(args['stimulus']['stimulus_table_path'])
7782

83+
# backwards compatibility
84+
stimulus_table['stimulus_name'] = stimulus_table['stimulus_name'].apply(
85+
lambda x: args['stimulus']['key'] if x == 'flashes' else x)
86+
if args['start_field'] not in stimulus_table:
87+
stimulus_table = stimulus_table.rename(
88+
columns={'Start': args['start_field']})
89+
7890
probewise_outputs = []
7991
for probe_idx, probe in enumerate(args['probes']):
8092
logging.info('Processing probe: {} (index: {})'.format(probe['name'],

allensdk/brain_observatory/ecephys/current_source_density/_current_source_density.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def extract_trial_windows(
7474

7575
if num_trials is not None:
7676
trials = trials.iloc[:num_trials, :]
77-
trials = trials.to_dict('record')
77+
trials = trials.to_dict('records')
7878

7979
relative_times = np.arange(-pre_stimulus_time,
8080
post_stimulus_time,

0 commit comments

Comments
 (0)