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

FIX extra autapse connection #50

Merged
merged 6 commits into from
Jun 11, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions mne_neuron/basket.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ def _synapse_create(self):
self.soma_nmda = self.syn_nmda_create(self.soma(0.5))

def _connect(self, gid, gid_dict, pos_dict, p, type_src, name_src,
lamtha=3., receptor='ampa'):
lamtha=3., receptor='ampa', autapses=True):
for gid_src, pos in zip(gid_dict[type_src],
pos_dict[type_src]):
if gid_src == gid:
if not autapses and gid_src == gid:
continue
nc_dict = {
'pos_src': pos,
Expand Down Expand Up @@ -235,7 +235,7 @@ def __init__(self, gid=-1, pos=-1):
# there are no connections from the L2Basket cells. congrats!
def parconnect(self, gid, gid_dict, pos_dict, p):
self._connect(gid, gid_dict, pos_dict, p, 'L5_basket', 'L5Basket',
lamtha=20., receptor='gabaa')
lamtha=20., receptor='gabaa', autapses=False)
self._connect(gid, gid_dict, pos_dict, p, 'L5_pyramidal', 'L5Pyr')
self._connect(gid, gid_dict, pos_dict, p, 'L2_pyramidal', 'L2Pyr')

Expand Down
33 changes: 33 additions & 0 deletions mne_neuron/tests/test_compare_hnn.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import os.path as op

from numpy import loadtxt
from numpy.testing import assert_array_equal

from mne.utils import _fetch_file
import mne_neuron
from mne_neuron import simulate_dipole, Params, Network


def test_mne_neuron():
"""Test to check if MNE neuron does not break."""
# small snippet of data on data branch for now. To be deleted
# later. Data branch should have only commit so it does not
# pollute the history.
data_url = ('https://raw.githubusercontent.com/jasmainak/'
'mne-neuron/test_data/dpl.txt')
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blakecaldwell would you mind providing me the dipole text file against which you are testing? I want to add it to the tests so that it doesn't hinder development of mne-neuron once it's fixed. I don't think what I have currently is the correct one ...

_fetch_file(data_url, 'dpl.txt')
dpl_master = loadtxt('dpl.txt')

mne_neuron_root = op.join(op.dirname(mne_neuron.__file__), '..')

params_fname = op.join(mne_neuron_root, 'param', 'default.json')
params = Params(params_fname)

net = Network(params, n_jobs=1)
dpl = simulate_dipole(net)

fname = './dpl2.txt'
dpl.write(fname)

dpl_pr = loadtxt(fname)
assert_array_equal(dpl_pr, dpl_master)