Merge branch 'master' of whale:scientificComputing

This commit is contained in:
Jan Benda 2017-01-24 12:14:21 +01:00
commit ab751a4bdd
3 changed files with 7 additions and 2 deletions

5
.gitignore vendored
View File

@ -3,14 +3,19 @@
*.lol *.lol
*.loe *.loe
*.idx *.idx
*.ilg
*.ind *.ind
*.log *.log
*.loi
*.loiboxf
*.aux *.aux
*.nav *.nav
*.out *.out
*.snm *.snm
*.toc *.toc
*.mat *.mat
*.pdf
*.eps
.#* .#*
#*# #*#
*.~ *.~

View File

@ -7,4 +7,4 @@ clean:
rm -f `basename *.tex .tex`.pdf rm -f `basename *.tex .tex`.pdf
zip: latex zip: latex
zip `basename *.tex .tex`.zip *.pdf *.dat *.mat zip `basename *.tex .tex`.zip *.pdf *.dat data/*.mat

View File

@ -6,7 +6,7 @@ vs = zeros(length(files), 1);
for i = 1:length(files) for i = 1:length(files)
load(strcat('../data/', files(i).name)) load(strcat('../data/', files(i).name))
eod_time = (1:length(eod)) .* dt; eod_time = (1:length(eod)) .* dt;
zero_crossings = zeroCrossings(eod, eod_time); zero_crossings = zeroCrossings(eod, eod_time, 0);
while spike_times(1) <= zero_crossings(1) while spike_times(1) <= zero_crossings(1)
spike_times(1) = []; spike_times(1) = [];
end end