Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Calculation of the spike-triggered phase and amplitude #121

Merged
merged 11 commits into from
Apr 4, 2018
Prev Previous commit
Next Next commit
Changed code to Neo 0.5
mdenker committed Oct 19, 2017
commit e4caf9484e310db09dbd1cec5afe3b378f7ab4bb
2 changes: 1 addition & 1 deletion elephant/phase_analysis.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"""
Methods for performing phase analysis.
:copyright: Copyright 2016 by the Elephant team, see AUTHORS.txt.
:copyright: Copyright 2017 by the Elephant team, see AUTHORS.txt.
:license: Modified BSD, see LICENSE.txt for details.
"""

5 changes: 3 additions & 2 deletions elephant/test/test_phase_analysis.py
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

import unittest

from neo import SpikeTrain, AnalogSignalArray
from neo import SpikeTrain, AnalogSignal
import numpy as np
import quantities as pq

@@ -27,7 +27,7 @@ def setUp(self):
t0 = np.arange(
0, tlen0.rescale(pq.s).magnitude,
fs0.rescale(pq.s).magnitude) * pq.s
self.anasig0 = AnalogSignalArray(
self.anasig0 = AnalogSignal(
np.sin(2 * np.pi * (f0 * t0).simplified.magnitude),
units=pq.mV, t_start=0 * pq.ms, sampling_period=fs0)
self.st0 = SpikeTrain(
@@ -106,5 +106,6 @@ def test_interpolate(self):
self.assertEqual(phases_noint[0][2], phases_int[0][0])
self.assertEqual(phases_noint[0][4], phases_int[0][0])


if __name__ == '__main__':
unittest.main()