From a78c7f46bf03710b0765c0a7bf6c24d329189fa0 Mon Sep 17 00:00:00 2001 From: Nick Tolley Date: Fri, 10 Mar 2023 15:57:37 -0500 Subject: [PATCH 1/2] Fix legacy mode param reading --- hnn_core/drives.py | 6 ++++++ hnn_core/tests/test_params.py | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hnn_core/drives.py b/hnn_core/drives.py index ed2a4bc66..d63ffefb5 100644 --- a/hnn_core/drives.py +++ b/hnn_core/drives.py @@ -145,6 +145,9 @@ def _add_drives_from_params(net): synaptic_delays=specs['synaptic_delays'], space_constant=specs['space_constant']) elif specs['type'] == 'poisson': + if (not net._legacy_mode) and specs[ + 'dynamics']['tstop'] < specs['dynamics']['tstart']: + continue net.add_poisson_drive( drive_name, tstart=specs['dynamics']['tstart'], tstop=specs['dynamics']['tstop'], @@ -165,6 +168,9 @@ def _add_drives_from_params(net): synaptic_delays=specs['synaptic_delays'], space_constant=specs['space_constant']) elif specs['type'] == 'bursty': + if (not net._legacy_mode) and specs[ + 'dynamics']['tstop'] < specs['dynamics']['tstart']: + continue net.add_bursty_drive( drive_name, tstart=specs['dynamics']['tstart'], diff --git a/hnn_core/tests/test_params.py b/hnn_core/tests/test_params.py index 39f490328..1f8817885 100644 --- a/hnn_core/tests/test_params.py +++ b/hnn_core/tests/test_params.py @@ -8,7 +8,7 @@ import pytest import hnn_core -from hnn_core import read_params, Params +from hnn_core import read_params, Params, jones_2009_model hnn_core_root = op.dirname(hnn_core.__file__) @@ -16,6 +16,11 @@ def test_read_params(): """Test reading of params object.""" params_fname = op.join(hnn_core_root, 'param', 'default.json') params = read_params(params_fname) + # Smoke test that network loads params + _ = jones_2009_model( + params, add_drives_from_params=True, legacy_mode=False) + _ = jones_2009_model( + params, add_drives_from_params=True, legacy_mode=True) print(params) print(params['L2Pyr*']) From 349008ec7cdccdb1b7b040d16f681a728a97d73f Mon Sep 17 00:00:00 2001 From: Nick Tolley Date: Fri, 10 Mar 2023 16:25:23 -0500 Subject: [PATCH 2/2] update whats_new.rst --- doc/whats_new.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/whats_new.rst b/doc/whats_new.rst index cb0e7a437..34db86ab8 100644 --- a/doc/whats_new.rst +++ b/doc/whats_new.rst @@ -75,6 +75,9 @@ Bug - Fix bug where :func:`~hnn_core.network.add_evoked_drive` failed when adding a drive with just NMDA weights, by `Nick Tolley`_ in :gh:`611` +- Fix bug where :func:`~hnn_core.params.read_params` failed to create a network when + legacy mode is False, by `Nick Tolley`_ in :gh:`614` + API ~~~ - Optimization of the evoked drives can be conducted on any :class:`~hnn_core.Network`