[MRG] Add name parameter to tonic bias and add tonic biases to different sections

hnn_core/cell.py

@@ -728,8 +728,9 @@ def _insert_dipole(self, sec_name_apical):
             dpp.ztan = seg_lens_z[-1]
         self.dipole = h.Vector().record(self.dpl_ref)
 
-    def create_tonic_bias(self, amplitude, t0, tstop, loc=0.5):
-        """Create tonic bias at the soma.
+    def create_tonic_bias(self, amplitude, t0, tstop, section='soma',
+                          loc=0.5):
+        """Create tonic bias at defined section.
 
         Parameters
         ----------
@@ -739,10 +740,13 @@ def create_tonic_bias(self, amplitude, t0, tstop, loc=0.5):
             The start time of tonic input (in ms).
         tstop : float
             The end time of tonic input (in ms).
+        section : str
+            Section tonic input is applied to.
         loc : float (0 to 1)
-            The location of the input in the soma section.
+            The location of the input in the section.
         """
-        stim = h.IClamp(self._nrn_sections['soma'](loc))
+
+        stim = h.IClamp(self._nrn_sections[section](loc))
         stim.delay = t0
         stim.dur = tstop - t0
         stim.amp = amplitude

hnn_core/cells_default.py

@@ -429,6 +429,7 @@ def pyramidal_ca(cell_name, pos, override_params=None, gid=None):
     override_params['L5Pyr_dend_gbar_ca'] = gbar_ca
     override_params['L5Pyr_dend_gnabar_hh2'] = gbar_na
     override_params['L5Pyr_dend_gkbar_hh2'] = gbar_k
+    override_params['L5Pyr_soma_gbar_ca'] = 10.
 
     cell = pyramidal(cell_name, pos, override_params=override_params,
                      gid=gid)

hnn_core/network.py

@@ -1133,7 +1133,8 @@ def _instantiate_drives(self, tstop, n_trials=1):
                 self.external_drives[
                     drive['name']]['events'].append(event_times)
 
-    def add_tonic_bias(self, *, cell_type=None, amplitude, t0=0, tstop=None):
+    def add_tonic_bias(self, *, cell_type=None, section=None,
+                       bias_name='tonic', amplitude, t0=0, tstop=None):
         """Attaches parameters of tonic bias input for given cell types
 
         Parameters
@@ -1142,6 +1143,10 @@ def add_tonic_bias(self, *, cell_type=None, amplitude, t0=0, tstop=None):
             The name of the cell type to add a tonic input. When supplied,
             a float value must be provided with the `amplitude` keyword.
             Valid inputs are those listed in  `net.cell_types`.
+        section : str | None
+            section the bias should be applied to.
+        bias_name : str | 'tonic'
+            The name of the bias.
         amplitude: dict | float
             A dictionary of cell type keys (str) to amplitude values (float).
             Valid inputs for cell types are those listed in `net.cell_types`.
@@ -1169,6 +1174,7 @@ def add_tonic_bias(self, *, cell_type=None, amplitude, t0=0, tstop=None):
             _validate_type(amplitude, (float, int), 'amplitude')
 
             _add_cell_type_bias(network=self, cell_type=cell_type,
+                                section=section, bias_name=bias_name,
                                 amplitude=float(amplitude),
                                 t_0=t0, t_stop=tstop)
         else:
@@ -1180,6 +1186,7 @@ def add_tonic_bias(self, *, cell_type=None, amplitude, t0=0, tstop=None):
 
             for _cell_type, _amplitude in amplitude.items():
                 _add_cell_type_bias(network=self, cell_type=_cell_type,
+                                    section=section, bias_name=bias_name,
                                     amplitude=_amplitude,
                                     t_0=t0, t_stop=tstop)
 
@@ -1648,7 +1655,7 @@ def __repr__(self):
 
 
 def _add_cell_type_bias(network: Network, amplitude: Union[float, dict],
-                        cell_type=None,
+                        cell_type=None, section=None, bias_name='tonic',
                         t_0=0, t_stop=None):
 
     if network is None:
@@ -1665,15 +1672,33 @@ def _add_cell_type_bias(network: Network, amplitude: Union[float, dict],
                              f'{list(network.cell_types.keys())}. '
                              f'Got {cell_type}')
 
-        if 'tonic' not in network.external_biases:
-            network.external_biases['tonic'] = dict()
+        if bias_name not in network.external_biases:
+            network.external_biases[bias_name] = dict()
 
-        if cell_type in network.external_biases['tonic']:
-            raise ValueError(f'Tonic bias already defined for {cell_type}')
+        if cell_type in network.external_biases[bias_name]:
+            raise ValueError(f'Bias named {bias_name} already defined '
+                             f'for {cell_type}')
 
         cell_type_bias = {
             'amplitude': amplitude,
             't0': t_0,
             'tstop': t_stop
         }
-        network.external_biases['tonic'][cell_type] = cell_type_bias
+
+        sections = list(network.cell_types[cell_type].sections.keys())
+
+        # Ensures backwards compatibility with existing json
+        # files (see test_read_configuration_json in test_io.py)
+        if section is None:
+            warnings.warn("Section for tonic bias is not defined."
+                          "Defaulting to 'soma'.",
+                          DeprecationWarning, stacklevel=1)
+        # error when section is defined that doesn't exist.
+        elif section not in sections:
+            raise ValueError(f'section must be an existing '
+                             f'section of the current cell or None. '
+                             f'Got {section}.')
+        else:
+            cell_type_bias['section'] = section
+
+        network.external_biases[bias_name][cell_type] = cell_type_bias

hnn_core/network_builder.py

@@ -441,10 +441,10 @@ def _create_cells_and_drives(self, threshold, record_vsec=False,
                 else:
                     cell.build()
                 # add tonic biases
-                if ('tonic' in self.net.external_biases and
-                        src_type in self.net.external_biases['tonic']):
-                    cell.create_tonic_bias(**self.net.external_biases
-                                           ['tonic'][src_type])
+                for bias in self.net.external_biases:
+                    if src_type in self.net.external_biases[bias]:
+                        cell.create_tonic_bias(**self.net.external_biases
+                                               [bias][src_type])
                 cell.record(record_vsec, record_isec, record_ca)
 
                 # this call could belong in init of a _Cell (with threshold)?

hnn_core/tests/test_gui.py

@@ -90,7 +90,8 @@ def check_drive(drive1, drive2, keys):
         for cell_type, bias_params in bias_dict.items():
             check_items(bias_params,
                         net2.external_biases[bias_name][cell_type],
-                        ignore_keys=['tstop'],
+                        # OK to ignore section here?
+                        ignore_keys=['tstop', 'section'],
                         message=f'{bias_name}>{cell_type}>')
 
     # Check all other attributes

hnn_core/tests/test_network.py

@@ -743,6 +743,7 @@ def test_add_cell_type():
 
 
 def test_tonic_biases():
+
     """Test tonic biases."""
     hnn_core_root = op.dirname(hnn_core.__file__)
 
@@ -855,9 +856,25 @@ def test_tonic_biases():
     assert 'tonic' in net.external_biases
     assert 'L5_pyramidal' not in net.external_biases['tonic']
     assert net.external_biases['tonic']['L2_pyramidal']['t0'] == 0
-    with pytest.raises(ValueError, match=r'Tonic bias already defined for.*$'):
+    with pytest.raises(ValueError, match=r'Bias named tonic already defined '
+                       r'for.*$'):
         net.add_tonic_bias(amplitude=tonic_bias_2)
 
+    # non-existent section
+    net.external_biases = dict()
+
+    with pytest.raises(ValueError, match=r'section must be an existing '
+                       r'section of the current cell or None. '
+                       r'Got apical_4.'):
+        net.add_tonic_bias(amplitude={'L2_pyramidal': .5}, section='apical_4')
+
+    # deprecation warning when section not defined
+    net.external_biases = dict()
+    with pytest.warns(DeprecationWarning,
+                      match=r"Section for tonic bias is not defined."
+                      r"Defaulting to 'soma'."):
+        net.add_tonic_bias(amplitude={'L2_pyramidal': .5})
+
 
 def test_network_mesh():
     """Test mesh for defining cell positions biases."""