diff --git a/pointprocesses/exercises/fanoplots.m b/pointprocesses/exercises/fanoplots.m index 949eb91..49d7343 100644 --- a/pointprocesses/exercises/fanoplots.m +++ b/pointprocesses/exercises/fanoplots.m @@ -1,9 +1,9 @@ spikes{1} = poissonspikes; spikes{2} = pifouspikes; spikes{3} = lifadaptspikes; -idents = {'poisson', 'pifou', 'lifadapt'}; +titles = {'poisson', 'pifou', 'lifadapt'}; for k = 1:3 figure(k) fanoplot(spikes{k}, titles{k}); - savefigpdf(gcf, sprintf('fanoplots%s.pdf', idents{k}), 20, 7); + savefigpdf(gcf, sprintf('fanoplots%s.pdf', titles{k}), 20, 7); end diff --git a/pointprocesses/exercises/fanoplotslifadapt.pdf b/pointprocesses/exercises/fanoplotslifadapt.pdf index a04d10c..cbe7ccd 100644 Binary files a/pointprocesses/exercises/fanoplotslifadapt.pdf and b/pointprocesses/exercises/fanoplotslifadapt.pdf differ diff --git a/pointprocesses/exercises/fanoplotspifou.pdf b/pointprocesses/exercises/fanoplotspifou.pdf index 47cf9cf..a9f9d72 100644 Binary files a/pointprocesses/exercises/fanoplotspifou.pdf and b/pointprocesses/exercises/fanoplotspifou.pdf differ diff --git a/pointprocesses/exercises/fanoplotspoisson.pdf b/pointprocesses/exercises/fanoplotspoisson.pdf index 8b1beac..457cc94 100644 Binary files a/pointprocesses/exercises/fanoplotspoisson.pdf and b/pointprocesses/exercises/fanoplotspoisson.pdf differ diff --git a/pointprocesses/exercises/isihist.pdf b/pointprocesses/exercises/isihist.pdf index 1fdab43..d3eee1d 100644 Binary files a/pointprocesses/exercises/isihist.pdf and b/pointprocesses/exercises/isihist.pdf differ diff --git a/pointprocesses/exercises/plotisihs.m b/pointprocesses/exercises/plotisihs.m index c2eef9e..a79bd85 100644 --- a/pointprocesses/exercises/plotisihs.m +++ b/pointprocesses/exercises/plotisihs.m @@ -1,19 +1,20 @@ maxisi = 300.0; subplot(1, 3, 1); +dt = 0.005; % bin width for ISIH in seconds poissonisis = isis(poissonspikes); -plotisihist(poissonisis, 0.001); +plotisihist(poissonisis, dt); xlim([0, maxisi]) title('Poisson'); subplot(1, 3, 2); pifouisis = isis(pifouspikes); -plotisihist(pifouisis, 0.001); +plotisihist(pifouisis, dt); xlim([0, maxisi]) title('PIF OU'); subplot(1, 3, 3); lifadaptisis = isis(lifadaptspikes); -plotisihist(lifadaptisis, 0.001); +plotisihist(lifadaptisis, dt); xlim([0, maxisi]) title('LIF adapt'); savefigpdf(gcf, 'isihist.pdf', 20, 7); diff --git a/pointprocesses/exercises/plotpoissonisih.m b/pointprocesses/exercises/plotpoissonisih.m index 2218196..01a01b7 100644 --- a/pointprocesses/exercises/plotpoissonisih.m +++ b/pointprocesses/exercises/plotpoissonisih.m @@ -1,12 +1,13 @@ maxisi = 300.0; +dt = 0.005; poissonisis = isis(poissonspikes); rate = 1.0/mean(poissonisis); -plotisihist(poissonisis, 0.001); +plotisihist(poissonisis, dt); tt = linspace(0.0, 0.001*maxisi, 200); pexp = rate*exp(-tt*rate); hold on; -plot(1000.0*tt, pexp, 'r') +plot(1000.0*tt, pexp, 'r', 'linewidth', 4) hold off; xlim([0, maxisi]) title('Poisson'); -savefigpdf(gcf, 'poissonisihist.pdf', 10, 7); +savefigpdf(gcf, 'poissonisihist.pdf', 10, 6); diff --git a/pointprocesses/exercises/plotspikeraster.m b/pointprocesses/exercises/plotspikeraster.m index 93eff59..4bf4a0e 100644 --- a/pointprocesses/exercises/plotspikeraster.m +++ b/pointprocesses/exercises/plotspikeraster.m @@ -1,3 +1,11 @@ +x = load('poisson.mat'); +poissonspikes = x.spikes; +x = load('pifou.mat'); +pifouspikes = x.spikes; +x = load('lifadapt.mat'); +lifadaptspikes = x.spikes; +clear x; + subplot(1, 3, 1); rasterplot(poissonspikes, 1.0); title('Poisson'); diff --git a/pointprocesses/exercises/pointprocesses-1.tex b/pointprocesses/exercises/pointprocesses-1.tex index 44cab5a..a27704c 100644 --- a/pointprocesses/exercises/pointprocesses-1.tex +++ b/pointprocesses/exercises/pointprocesses-1.tex @@ -35,8 +35,8 @@ How do you access single spike times? \begin{solution} \begin{lstlisting} - clear all % not so good: + clear all load poisson.mat whos poissonspikes = spikes; @@ -55,6 +55,15 @@ lifadaptspikes = x.spikes; clear x; \end{lstlisting} + The files contain cell arrays with 20 trials of spike + trains. Each spike train is a vector containing the times of + spikes. + \begin{lstlisting} + % access first trial: + trial = poissonspikes{1}; + % access second spike of first trial: + trial(2); + \end{lstlisting} \end{solution} \newsolutionpage @@ -112,11 +121,11 @@ of the mean interspike interval. \begin{solution} \lstinputlisting{plotpoissonisih.m} - %\mbox{}\\[-3ex] - %\colorbox{white}{\includegraphics[width=1\textwidth]{poissonisihist}} + \mbox{}\\[-3ex] + \colorbox{white}{\includegraphics{poissonisihist}} \end{solution} - - \continuepage + + \continue % XXX Add return map!!! XXX \part Write a function that computes the serial correlations of interspike intervals for lags up to \code{maxlag}. The serial diff --git a/pointprocesses/exercises/rasterplot.m b/pointprocesses/exercises/rasterplot.m index ccbfe60..db92539 100644 --- a/pointprocesses/exercises/rasterplot.m +++ b/pointprocesses/exercises/rasterplot.m @@ -6,7 +6,7 @@ function rasterplot(spikes, tmax) % Arguments: % spikes: a cell array of vectors of spike times in seconds % tmax: plot spike raster up to tmax seconds - in_msecs = tmax < 1.5 + in_msecs = tmax < 1.5; spiketimes = []; trials = []; ntrials = length(spikes); diff --git a/pointprocesses/code/savefigpdf.m b/pointprocesses/exercises/savefigpdf.m similarity index 100% rename from pointprocesses/code/savefigpdf.m rename to pointprocesses/exercises/savefigpdf.m diff --git a/pointprocesses/exercises/serialcorr.pdf b/pointprocesses/exercises/serialcorr.pdf index 5ce399b..51b3d2b 100644 Binary files a/pointprocesses/exercises/serialcorr.pdf and b/pointprocesses/exercises/serialcorr.pdf differ diff --git a/pointprocesses/exercises/spikecountshists.pdf b/pointprocesses/exercises/spikecountshists.pdf index a940a04..3a217f0 100644 Binary files a/pointprocesses/exercises/spikecountshists.pdf and b/pointprocesses/exercises/spikecountshists.pdf differ diff --git a/pointprocesses/exercises/spikeraster.pdf b/pointprocesses/exercises/spikeraster.pdf index 68c6e28..f75555a 100644 Binary files a/pointprocesses/exercises/spikeraster.pdf and b/pointprocesses/exercises/spikeraster.pdf differ