bug fixes

This commit is contained in:
efish 2018-11-15 14:33:11 +01:00
parent 5a7b18f3bb
commit 67353f5c0b
2 changed files with 17 additions and 5 deletions

View File

@ -7,7 +7,13 @@ def read_baseline_eod(dataset):
base = dataset.split(os.path.sep)[-1] + ".nix"
nix_file = nix.File.open(os.path.join(dataset, base), nix.FileMode.ReadOnly)
b = nix_file.blocks[0]
t = b.tags["BaselineActivity_1"]
if 'BaselineActivity_1' in b.tags:
t = b.tags["BaselineActivity_1"]
elif "BaselineActivity_2" in b.tags:
t = b.tags["BaselineActivity_2"]
else:
f.close()
return [],[]
eod_da = b.data_arrays["LocalEOD-1"]
eod = t.retrieve_data("LocalEOD-1")[:]
time = np.asarray(eod_da.dimensions[0].axis(len(eod)))
@ -19,7 +25,13 @@ def read_baseline_spikes(dataset):
base = dataset.split(os.path.sep)[-1] + ".nix"
nix_file = nix.File.open(os.path.join(dataset, base), nix.FileMode.ReadOnly)
b = nix_file.blocks[0]
t = b.tags["BaselineActivity_1"]
if 'BaselineActivity_1' in b.tags:
t = b.tags["BaselineActivity_1"]
elif "BaselineActivity_2" in b.tags:
t = b.tags["BaselineActivity_2"]
else:
f.close()
return [],[]
spikes_da = b.data_arrays["Spikes-1"]
spike_times = spikes_da[:spikes_da.shape[0]-5000]
baseline_spikes = spike_times[(spike_times > t.position[0]) & (spike_times < (t.position[0] + t.extent[0]))]

View File

@ -2,7 +2,7 @@ import numpy as np
import os
def load_chirp_spikes(dataset):
def read_chirp_spikes(dataset):
spikes_file = os.path.join(dataset, "chirpspikess1.dat")
if not os.path.exists(spikes_file):
print("found no chirps!")
@ -32,7 +32,7 @@ def load_chirp_spikes(dataset):
return spikes
def load_chirp_eod(dataset):
def read_chirp_eod(dataset):
eod_file = os.path.join(dataset, "chirpeodampls.dat")
if not os.path.exists(eod_file):
print("found no chirpeodampls.dat!")
@ -60,7 +60,7 @@ def load_chirp_eod(dataset):
return chirp_eod
def load_chirp_times(dataset):
def read_chirp_times(dataset):
chirp_times_file = os.path.join(dataset, "chirpss.dat")
if not os.path.exists(chirp_times_file):
print("found no chirpss.dat!")