bluecellulab 2.6.40__py3-none-any.whl → 2.6.41__py3-none-any.whl

bluecellulab/analysis/analysis.py

@@ -8,26 +8,56 @@ import numpy as np
 from bluecellulab.stimulus import StimulusFactory
 from bluecellulab.tools import calculate_rheobase
 from bluecellulab.analysis.inject_sequence import run_stimulus
-from bluecellulab.analysis.plotting import plot_iv_curve
+from bluecellulab.analysis.plotting import plot_iv_curve, plot_fi_curve
 
 
-def compute_plot_iv_curve(cell, stim_start=100.0, duration=500.0, post_delay=100.0, threshold_voltage=-30, nb_bins=11):
-    """Compute and plot the IV curve from a given cell by injecting a
-    predefined range of currents.
+def compute_plot_iv_curve(cell,
+                          injecting_section="soma[0]",
+                          injecting_segment=0.5,
+                          recording_section="soma[0]",
+                          recording_segment=0.5,
+                          stim_start=100.0,
+                          duration=500.0,
+                          post_delay=100.0,
+                          threshold_voltage=-30,
+                          nb_bins=11):
+    """Compute and plot the Current-Voltage (I-V) curve for a given cell by
+    injecting a range of currents.
+
+    This function evaluates the relationship between the injected current amplitude and the resulting
+    steady-state membrane potential of a neuronal cell model. Currents are injected at a specified section
+    and segment, and the steady-state voltage at the recording location is used to construct the I-V curve.
 
     Args:
-        cell (bluecellulab.cell.Cell): The initialized cell model.
-        stim_start (float): Start time for current injection (in ms). Default is 100.0 ms.
-        duration (float): Duration of current injection (in ms). Default is 500.0 ms.
-        post_delay (float): Delay after the stimulation ends (in ms). Default is 100.0 ms.
-        nb_bins (int): Number of current injection levels. Default is 11.
+        cell (bluecellulab.cell.Cell): The initialized BlueCelluLab cell model.
+        injecting_section (str, optional): The name of the section where the stimulus is injected.
+            Default is "soma[0]".
+        injecting_segment (float, optional): The position along the injecting section (0.0 to 1.0)
+            where the stimulus is applied. Default is 0.5.
+        recording_section (str, optional): The name of the section where the voltage is recorded.
+            Default is "soma[0]".
+        recording_segment (float, optional): The position along the recording section (0.0 to 1.0)
+            where the voltage is recorded. Default is 0.5.
+        stim_start (float, optional): The start time of the current injection (in ms). Default is 100.0 ms.
+        duration (float, optional): The duration of the current injection (in ms). Default is 500.0 ms.
+        post_delay (float, optional): The delay after the stimulation ends before the simulation stops
+            (in ms). Default is 100.0 ms.
+        threshold_voltage (float, optional): The voltage threshold (in mV) for detecting a steady-state
+            response. Default is -30 mV.
+        nb_bins (int, optional): The number of discrete current levels between 0 and the maximum current.
+            Default is 11.
 
     Returns:
         tuple: A tuple containing:
-            - list_amp (np.ndarray): The predefined injected step current levels (nA).
-            - steady_states (np.ndarray): The corresponding steady-state voltages (mV).
+            - list_amp (np.ndarray): The injected current amplitudes (nA).
+            - steady_states (np.ndarray): The corresponding steady-state voltages (mV) recorded at the
+              specified location.
+
+    Raises:
+        ValueError: If the cell object is invalid, the specified sections/segments are not found, or if
+            the simulation results are inconsistent.
     """
-    rheobase = calculate_rheobase(cell)
+    rheobase = calculate_rheobase(cell=cell, section=injecting_section, segx=injecting_segment)
 
     list_amp = np.linspace(rheobase - 2, rheobase - 0.1, nb_bins)  # [nA]
 
@@ -35,10 +65,15 @@ def compute_plot_iv_curve(cell, stim_start=100.0, duration=500.0, post_delay=100
     times = []
     voltages = []
     # inject step current and record voltage response
+    stim_factory = StimulusFactory(dt=0.1)
     for amp in list_amp:
-        stim_factory = StimulusFactory(dt=0.1)
         step_stimulus = stim_factory.step(pre_delay=stim_start, duration=duration, post_delay=post_delay, amplitude=amp)
-        recording = run_stimulus(cell.template_params, step_stimulus, section="soma[0]", segment=0.5)
+        recording = run_stimulus(cell.template_params,
+                                 step_stimulus,
+                                 section=injecting_section,
+                                 segment=injecting_segment,
+                                 recording_section=recording_section,
+                                 recording_segment=recording_segment)
         steps.append(step_stimulus)
         times.append(recording.time)
         voltages.append(recording.voltage)
@@ -57,7 +92,86 @@ def compute_plot_iv_curve(cell, stim_start=100.0, duration=500.0, post_delay=100
         steady_state = features_results[0]['steady_state_voltage_stimend']
         steady_states.append(steady_state)
 
-    # plot I-V curve
-    plot_iv_curve(list_amp, steady_states)
+    plot_iv_curve(list_amp,
+                  steady_states,
+                  injecting_section=injecting_section,
+                  injecting_segment=injecting_segment,
+                  recording_section=recording_section,
+                  recording_segment=recording_segment)
 
     return np.array(list_amp), np.array(steady_states)
+
+
+def compute_plot_fi_curve(cell,
+                          injecting_section="soma[0]",
+                          injecting_segment=0.5,
+                          recording_section="soma[0]",
+                          recording_segment=0.5,
+                          stim_start=100.0,
+                          duration=500.0,
+                          post_delay=100.0,
+                          max_current=0.8,
+                          nb_bins=11):
+    """Compute and plot the Frequency-Current (F-I) curve for a given cell by
+    injecting a range of currents.
+
+    This function evaluates the relationship between injected current amplitude and the firing rate
+    of a neuronal cell model. Currents are injected at a specified section and segment, and the number
+    of spikes recorded in the specified recording location is used to construct the F-I curve.
+
+    Args:
+        cell (bluecellulab.cell.Cell): The initialized BlueCelluLab cell model.
+        injecting_section (str, optional): The name of the section where the stimulus is injected.
+            Default is "soma[0]".
+        injecting_segment (float, optional): The position along the injecting section (0.0 to 1.0)
+            where the stimulus is applied. Default is 0.5.
+        recording_section (str, optional): The name of the section where spikes are recorded.
+            Default is "soma[0]".
+        recording_segment (float, optional): The position along the recording section (0.0 to 1.0)
+            where spikes are recorded. Default is 0.5.
+        stim_start (float, optional): The start time of the current injection (in ms). Default is 100.0 ms.
+        duration (float, optional): The duration of the current injection (in ms). Default is 500.0 ms.
+        post_delay (float, optional): The delay after the stimulation ends before the simulation stops
+            (in ms). Default is 100.0 ms.
+        max_current (float, optional): The maximum amplitude of the injected current (in nA).
+            Default is 0.8 nA.
+        nb_bins (int, optional): The number of discrete current levels between 0 and `max_current`.
+            Default is 11.
+
+    Returns:
+        tuple: A tuple containing:
+            - list_amp (np.ndarray): The injected current amplitudes (nA).
+            - spike_count (np.ndarray): The corresponding spike counts for each current amplitude.
+
+    Raises:
+        ValueError: If the cell object is invalid or the specified sections/segments are not found.
+    """
+    rheobase = calculate_rheobase(cell=cell, section=injecting_section, segx=injecting_segment)
+
+    list_amp = np.linspace(rheobase, max_current, nb_bins)  # [nA]
+    steps = []
+    spikes = []
+    # inject step current and record spike response
+    stim_factory = StimulusFactory(dt=0.1)
+    for amp in list_amp:
+        step_stimulus = stim_factory.step(pre_delay=stim_start, duration=duration, post_delay=post_delay, amplitude=amp)
+        recording = run_stimulus(cell.template_params,
+                                 step_stimulus,
+                                 section=injecting_section,
+                                 segment=injecting_segment,
+                                 recording_section=recording_section,
+                                 recording_segment=recording_segment,
+                                 enable_spike_detection=True)
+        steps.append(step_stimulus)
+        spikes.append(recording.spike)
+
+    spike_count = [len(spike) for spike in spikes]
+
+    plot_fi_curve(list_amp,
+                  spike_count,
+                  injecting_section=injecting_section,
+                  injecting_segment=injecting_segment,
+                  recording_section=recording_section,
+                  recording_segment=recording_segment)
+
+    return np.array(list_amp), np.array(spike_count)

bluecellulab/analysis/inject_sequence.py

@@ -1,7 +1,7 @@
 """Module for injecting a sequence of protocols to the cell."""
 from __future__ import annotations
 from enum import Enum, auto
-from typing import NamedTuple, Sequence, Dict
+from typing import NamedTuple, Sequence, Dict, Optional
 
 import neuron
 import numpy as np
@@ -11,6 +11,7 @@ from bluecellulab.simulation.parallel import IsolatedProcess
 from bluecellulab.simulation.simulation import Simulation
 from bluecellulab.stimulus.circuit_stimulus_definitions import Hyperpolarizing
 from bluecellulab.stimulus.factory import Stimulus, StimulusFactory
+from bluecellulab.tools import validate_section_and_segment
 
 
 class StimulusName(Enum):
@@ -24,10 +25,12 @@ class StimulusName(Enum):
 
 
 class Recording(NamedTuple):
-    """A tuple of the current, voltage and time recordings."""
+    """A tuple of the current, voltage and time recordings with optional spike
+    recordings."""
     current: np.ndarray
     voltage: np.ndarray
     time: np.ndarray
+    spike: np.ndarray | None
 
 
 StimulusRecordings = Dict[str, Recording]
@@ -40,41 +43,91 @@ def run_stimulus(
     segment: float,
     cvode: bool = True,
     add_hypamp: bool = True,
+    recording_section: str = "soma[0]",
+    recording_segment: float = 0.5,
+    enable_spike_detection: bool = False,
+    threshold_spike_detection: float = -30,
 ) -> Recording:
-    """Creates a cell and stimulates it with a given stimulus.
+    """Creates a cell from template parameters, applies a stimulus, and records
+    the response.
+
+    This function simulates the electrical activity of a neuronal cell model by injecting
+    a stimulus into a specified section and segment, recording the voltage response, and
+    optionally detecting spikes.
 
     Args:
-        template_params: The parameters to create the cell from a template.
-        stimulus: The input stimulus to inject into the cell.
-        section: Name of the section of cell where the stimulus is to be injected.
-        segment: The segment of the section where the stimulus is to be injected.
-        cvode: True to use variable time-steps. False for fixed time-steps.
+        template_params (TemplateParams): Parameters required to create the cell from a
+            specified template, including morphology and mechanisms.
+        stimulus (Stimulus): The stimulus waveform to inject, defined by time and current arrays.
+        section (str): Name of the section of the cell where the stimulus is applied.
+            (e.g. soma[0])
+        segment (float): The normalized position (0.0 to 1.0) along the injecting
+            section where the stimulus is applied.
+        cvode (bool, optional): Whether to use variable time-step integration. Defaults to True.
+        add_hypamp (bool, optional): If True, adds a hyperpolarizing stimulus before applying
+            the main stimulus. Defaults to True.
+        recording_section (str): Name of the section of the cell where voltage is recorded.
+        recording_segment (float): The normalized position (0.0 to 1.0) along the recording
+            section where voltage is recorded.
+        enable_spike_detection (bool, optional): If True, enables spike detection at the
+            recording location. Defaults to False.
+        threshold_spike_detection (float, optional): The voltage threshold (mV) for spike detection.
+            Defaults to -30 mV.
 
     Returns:
-        The voltage-time recording at the specified location.
+        Recording: A `Recording` object containing the following:
+            - `current` (np.ndarray): The injected current waveform (nA).
+            - `voltage` (np.ndarray): The recorded membrane potential (mV) over time.
+            - `time` (np.ndarray): The simulation time points (ms).
+            - `spike` (np.ndarray or None): The detected spikes, if spike detection is enabled.
 
     Raises:
-        ValueError: If the time and voltage arrays are not the same length.
+        ValueError: If the time, current, and voltage arrays do not have the same length,
+            or if the specified sections or segments are not found in the cell model.
     """
     cell = Cell.from_template_parameters(template_params)
-    neuron_section = cell.sections[section]
+
+    validate_section_and_segment(cell, section, segment)
+    validate_section_and_segment(cell, recording_section, recording_segment)
+
     if add_hypamp:
         hyp_stim = Hyperpolarizing(target="", delay=0.0, duration=stimulus.stimulus_time)
         cell.add_replay_hypamp(hyp_stim)
-    cell.add_voltage_recording(neuron_section, segment)
+
+    cell.add_voltage_recording(cell.sections[recording_section], recording_segment)
+
+    # Set up spike detection if enabled
+    spikes: Optional[np.ndarray] = None
+    if enable_spike_detection:
+        recording_location = f"{recording_section}({str(recording_segment)})"
+        cell.start_recording_spikes(None, location=recording_location, threshold=threshold_spike_detection)
+
+    # Inject the stimulus and run the simulation
     iclamp, _ = cell.inject_current_waveform(
-        stimulus.time, stimulus.current, section=neuron_section, segx=segment
+        stimulus.time, stimulus.current, section=cell.sections[section], segx=segment
     )
     current_vector = neuron.h.Vector()
     current_vector.record(iclamp._ref_i)
+
     simulation = Simulation(cell)
     simulation.run(stimulus.stimulus_time, cvode=cvode)
+
+    # Retrieve simulation results
     current = np.array(current_vector.to_python())
-    voltage = cell.get_voltage_recording(neuron_section, segment)
+    voltage = cell.get_voltage_recording(cell.sections[recording_section], recording_segment)
     time = cell.get_time()
+
     if len(time) != len(voltage) or len(time) != len(current):
-        raise ValueError("Time, current and voltage arrays are not the same length")
-    return Recording(current, voltage, time)
+        raise ValueError("Time, current, and voltage arrays are not the same length")
+
+    if enable_spike_detection:
+        results = cell.get_recorded_spikes(location=recording_location, threshold=threshold_spike_detection)
+        if results is not None:
+            spikes = np.array(results)
+        else:
+            spikes = None
+
+    return Recording(current=current, voltage=voltage, time=time, spike=spikes)
 
 
 def apply_multiple_stimuli(

bluecellulab/analysis/plotting.py

@@ -3,23 +3,55 @@
 import matplotlib.pyplot as plt
 
 
-def plot_iv_curve(currents, voltages):
+def plot_iv_curve(currents, voltages, injecting_section, injecting_segment, recording_section, recording_segment):
     """Plots the IV curve.
 
     Args:
-        currents (iterable): The injected current levels (nA).
-        voltages (iterable): The corresponding steady-state voltages (mV).
+        currents (list): The injected current levels (nA).
+        voltages (list): The corresponding steady-state voltages (mV).
+        injecting_section (str): The section in the cell where the current was injected.
+        injecting_segment (float): The segment position (0.0 to 1.0) where the current was injected.
+        recording_section (str): The section in the cell where spikes were recorded.
+        recording_segment (float): The segment position (0.0 to 1.0) where spikes were recorded.
+
     Raises:
         ValueError: If the lengths of currents and voltages do not match.
     """
     if len(currents) != len(voltages):
         raise ValueError("currents and voltages must have the same length")
 
-    # Plotting
     plt.figure(figsize=(10, 6))
-    plt.plot(voltages, currents, marker='o', linestyle='-', color='b')
+    plt.plot(currents, voltages, marker='o', linestyle='-', color='b')
     plt.title("I-V Curve")
-    plt.ylabel("Injected current [nA]")
-    plt.xlabel("Steady state voltage [mV]")
+    plt.xlabel(f"Injected Current [nA] at {injecting_section}({injecting_segment:.2f})")
+    plt.ylabel(f"Steady state voltage [mV] at {recording_section}({recording_segment:.2f})")
+    plt.grid(True)
+    plt.tight_layout()
+    plt.show()
+
+
+def plot_fi_curve(currents, spike_count, injecting_section, injecting_segment, recording_section, recording_segment):
+    """Plots the F-I (Frequency-Current) curve.
+
+    Args:
+        currents (list): The injected current levels (nA).
+        spike_count (list): The number of spikes recorded for each current level.
+        injecting_section (str): The section in the cell where the current was injected.
+        injecting_segment (float): The segment position (0.0 to 1.0) where the current was injected.
+        recording_section (str): The section in the cell where spikes were recorded.
+        recording_segment (float): The segment position (0.0 to 1.0) where spikes were recorded.
+
+    Raises:
+        ValueError: If the lengths of currents and spike counts do not match.
+    """
+    if len(currents) != len(spike_count):
+        raise ValueError("currents and spike count must have the same length")
+
+    plt.figure(figsize=(10, 6))
+    plt.plot(currents, spike_count, marker='o')
+    plt.title("F-I Curve")
+    plt.xlabel(f"Injected Current [nA] at {injecting_section}({injecting_segment:.2f})")
+    plt.ylabel(f"Spike Count recorded at {recording_section}({recording_segment:.2f})")
+    plt.grid(True)
     plt.tight_layout()
     plt.show()

bluecellulab/cell/core.py

@@ -25,6 +25,7 @@ from typing_extensions import deprecated
 import neuron
 import numpy as np
 import pandas as pd
+import re
 
 import bluecellulab
 from bluecellulab.cell.recording import section_to_voltage_recording_str
@@ -376,7 +377,11 @@ class Cell(InjectableMixin, PlottableMixin):
 
     def get_recording(self, var_name: str) -> np.ndarray:
         """Get recorded values."""
-        return np.array(self.recordings[var_name].to_python())
+        try:
+            res = np.array(self.recordings[var_name].to_python())
+        except KeyError as e:
+            raise ValueError(f"No recording for '{var_name}' was found.") from e
+        return res
 
     def add_replay_synapse(self,
                            synapse_id: SynapseID,
@@ -432,19 +437,42 @@ class Cell(InjectableMixin, PlottableMixin):
     def create_netcon_spikedetector(self, target: HocObjectType, location: str, threshold: float = -30.0) -> HocObjectType:
         """Add and return a spikedetector.
 
-        This is a NetCon that detects spike in the current cell, and that
-        connects to target
+        This function creates a NetCon object that detects spikes at a specific
+        location in the current cell and connects to the provided target point process.
+        The location can be specified as a predefined site ('soma' or 'AIS') or as a
+        custom location in the format `section[index](position)`. Custom locations
+        allow fine-grained control of the spike detection site within the cell's sections.
 
         Args:
-            target: target point process
-            location: the spike detection location
-            threshold: spike detection threshold
+            target: A NEURON point process object (e.g., synapse) that the NetCon connects to.
+            location: The spike detection location. Acceptable formats include:
+
+                - `"soma"`: Detect spikes in the soma section at the distal end.
+
+                - `"AIS"`: Detect spikes in the axon initial segment at the midpoint.
 
-        Returns: Neuron netcon object
+                - `"section[index](position)"`: Custom location specifying:
+
+                  - `section`: The name of the section (e.g., 'soma', 'axon').
+                  - `[index]` (optional): Segment index within a section array (e.g., 'soma[0]').
+                  - `(position)` (optional): Normalized position along the section length (0 to 1).
+                    Defaults to 0.5 if not provided.
+
+            threshold: The voltage threshold for spike detection (default: -30.0 mV).
+
+        Returns:
+            A NEURON `NetCon` object configured for spike detection at the specified location.
 
         Raises:
-            ValueError: If the spike detection location is not 'soma' or 'AIS'.
+            ValueError: If:
+
+                - The `location` is not 'soma', 'AIS', or a valid custom format.
+
+                - The specified section or segment index does not exist.
+
+                - The position is out of bounds (e.g., negative or greater than 1.0).
         """
+
         if location == "soma":
             sec = public_hoc_cell(self.cell).soma[0]
             source = sec(1)._ref_v
@@ -452,7 +480,34 @@ class Cell(InjectableMixin, PlottableMixin):
             sec = public_hoc_cell(self.cell).axon[1]
             source = sec(0.5)._ref_v
         else:
-            raise ValueError("Spike detection location must be soma or AIS")
+            # Parse custom location (e.g., 'soma[0](0.3)')
+            pattern = r'^([a-zA-Z_]+)(?:\[(\d+)\])?(?:\((-?\d+\.\d+)\))?$'
+            match = re.search(pattern, location)
+
+            # Extract the value if a match is found
+            if match:
+                section_name = match.group(1)
+                segment_index = match.group(2)
+                pos = match.group(3)
+                if pos is None:
+                    pos = 0.5
+                else:
+                    pos = float(pos)
+
+            else:
+                raise ValueError(f"Invalid location format: {location}")
+
+            try:
+                # Handle section arrays (e.g., soma[0])
+                if segment_index is not None:
+                    sec = getattr(public_hoc_cell(self.cell), section_name)[int(segment_index)]
+                else:
+                    sec = getattr(public_hoc_cell(self.cell), section_name)
+
+                source = sec(pos)._ref_v
+            except (AttributeError, ValueError, IndexError) as e:
+                raise ValueError(f"Invalid spike detection location: {location}") from e
+
         netcon = neuron.h.NetCon(source, target, sec=sec)
         netcon.threshold = threshold
         return netcon

bluecellulab/tools.py

@@ -28,6 +28,8 @@ from bluecellulab.circuit.circuit_access import EmodelProperties
 from bluecellulab.exceptions import UnsteadyCellError
 from bluecellulab.simulation.parallel import IsolatedProcess
 from bluecellulab.utils import CaptureOutput
+from bluecellulab.type_aliases import NeuronSection
+
 
 logger = logging.getLogger(__name__)
 
@@ -38,10 +40,13 @@ def calculate_input_resistance(
     template_format: str,
     emodel_properties: EmodelProperties | None,
     current_delta: float = 0.01,
+    section: str = "soma[0]",
+    segx: float = 0.5
 ) -> float:
     """Calculate the input resistance at rest of the cell."""
     rest_voltage = calculate_SS_voltage(
-        template_path, morphology_path, template_format, emodel_properties, 0.0
+        template_path, morphology_path, template_format, emodel_properties, 0.0,
+        section=section, segx=segx
     )
     step_voltage = calculate_SS_voltage(
         template_path,
@@ -49,6 +54,8 @@ def calculate_input_resistance(
         template_format,
         emodel_properties,
         current_delta,
+        section=section,
+        segx=segx
     )
 
     voltage_delta = step_voltage - rest_voltage
@@ -64,6 +71,8 @@ def calculate_SS_voltage(
     step_level: float,
     check_for_spiking=False,
     spike_threshold=-20.0,
+    section: str = "soma[0]",
+    segx: float = 0.5
 ) -> float:
     """Calculate the steady state voltage at a certain current step."""
     with IsolatedProcess() as runner:
@@ -77,6 +86,8 @@ def calculate_SS_voltage(
                 step_level,
                 check_for_spiking,
                 spike_threshold,
+                section,
+                segx
             ],
         )
     return SS_voltage
@@ -90,6 +101,8 @@ def calculate_SS_voltage_subprocess(
     step_level: float,
     check_for_spiking: bool,
     spike_threshold: float,
+    section: str = "soma[0]",
+    segx: float = 0.5
 ) -> float:
     """Subprocess wrapper of calculate_SS_voltage.
 
@@ -104,11 +117,15 @@ def calculate_SS_voltage_subprocess(
         template_format=template_format,
         emodel_properties=emodel_properties,
     )
-    cell.add_ramp(500, 5000, step_level, step_level)
+
+    sec = get_section(cell, section)
+    neuron_section = sec
+    cell.add_voltage_recording(cell.sections[section], segx)
+    cell.add_ramp(500, 5000, step_level, step_level, section=neuron_section, segx=segx)
     simulation = bluecellulab.Simulation()
     simulation.run(1000, cvode=template_accepts_cvode(template_path))
     time = cell.get_time()
-    voltage = cell.get_soma_voltage()
+    voltage = cell.get_voltage_recording(section=neuron_section, segx=segx)
     SS_voltage = np.mean(voltage[np.where((time < 1000) & (time > 800))])
     cell.delete()
 
@@ -250,6 +267,8 @@ def detect_spike_step(
     inj_start: float,
     inj_stop: float,
     step_level: float,
+    section: str = "soma[0]",
+    segx: float = 0.5
 ) -> bool:
     """Detect if there is a spike at a certain step level."""
     with IsolatedProcess() as runner:
@@ -264,6 +283,8 @@ def detect_spike_step(
                 inj_start,
                 inj_stop,
                 step_level,
+                section,
+                segx
             ],
         )
     return spike_detected
@@ -277,7 +298,9 @@ def detect_spike_step_subprocess(
     hyp_level: float,
     inj_start: float,
     inj_stop: float,
-    step_level: float
+    step_level: float,
+    section: str = "soma[0]",
+    segx: float = 0.5
 ) -> bool:
     """Detect if there is a spike at a certain step level."""
     cell = bluecellulab.Cell(
@@ -285,13 +308,18 @@ def detect_spike_step_subprocess(
         morphology_path=morphology_path,
         template_format=template_format,
         emodel_properties=emodel_properties)
-    cell.add_ramp(0, 5000, hyp_level, hyp_level)
-    cell.add_ramp(inj_start, inj_stop, step_level, step_level)
+
+    sec = get_section(cell, section)
+    cell.add_voltage_recording(cell.sections[section], segx)
+
+    neuron_section = sec
+    cell.add_ramp(0, 5000, hyp_level, hyp_level, section=neuron_section, segx=segx)
+    cell.add_ramp(inj_start, inj_stop, step_level, step_level, section=neuron_section, segx=segx)
     simulation = bluecellulab.Simulation()
     simulation.run(int(inj_stop), cvode=template_accepts_cvode(template_path))
 
     time = cell.get_time()
-    voltage = cell.get_soma_voltage()
+    voltage = cell.get_voltage_recording(section=neuron_section, segx=segx)
     voltage_step = voltage[np.where((time > inj_start) & (time < inj_stop))]
     spike_detected = detect_spike(voltage_step)
 
@@ -319,6 +347,8 @@ def search_threshold_current(
     min_current: float,
     max_current: float,
     current_precision: float = 0.01,
+    section: str = "soma[0]",
+    segx: float = 0.5
 ):
     """Search current necessary to reach threshold."""
     if abs(max_current - min_current) < current_precision:
@@ -328,7 +358,8 @@ def search_threshold_current(
 
     spike_detected = detect_spike_step(
         template_name, morphology_path, template_format, emodel_properties,
-        hyp_level, inj_start, inj_stop, med_current
+        hyp_level, inj_start, inj_stop, med_current,
+        section=section, segx=segx
     )
     logger.info("Spike threshold detection at: %f nA" % med_current)
 
@@ -337,13 +368,15 @@ def search_threshold_current(
                                         template_format, emodel_properties,
                                         hyp_level, inj_start, inj_stop,
                                         min_current, med_current,
-                                        current_precision)
+                                        current_precision,
+                                        section=section, segx=segx)
     else:
         return search_threshold_current(template_name, morphology_path,
                                         template_format, emodel_properties,
                                         hyp_level, inj_start, inj_stop,
                                         med_current, max_current,
-                                        current_precision)
+                                        current_precision,
+                                        section=section, segx=segx)
 
 
 def check_empty_topology() -> bool:
@@ -354,12 +387,17 @@ def check_empty_topology() -> bool:
     return stdout == ['', '']
 
 
-def calculate_max_thresh_current(cell: Cell, threshold_voltage: float = -30.0) -> float:
+def calculate_max_thresh_current(cell: Cell,
+                                 threshold_voltage: float = -30.0,
+                                 section: str = "soma[0]",
+                                 segx: float = 0.5) -> float:
     """Calculate the upper bound threshold current.
 
     Args:
         cell (bluecellulab.cell.Cell): The initialized cell model.
         threshold_voltage (float, optional): Voltage threshold for spike detection. Default is -30.0 mV.
+        section (str, optional): The section where current is injected.
+        segx (float, optional): Fractional location within the section for current injection.
 
     Returns:
         float: The upper bound threshold current.
@@ -371,6 +409,8 @@ def calculate_max_thresh_current(cell: Cell, threshold_voltage: float = -30.0) -
         template_format=cell.template_params.template_format,
         emodel_properties=cell.template_params.emodel_properties,
         step_level=0.0,
+        section=section,
+        segx=segx
     )
 
     # Calculate input resistance (rin)
@@ -379,6 +419,8 @@ def calculate_max_thresh_current(cell: Cell, threshold_voltage: float = -30.0) -
         morphology_path=cell.template_params.morph_filepath,
         template_format=cell.template_params.template_format,
         emodel_properties=cell.template_params.emodel_properties,
+        section=section,
+        segx=segx
     )
 
     # Calculate upperbound threshold current
@@ -391,7 +433,9 @@ def calculate_max_thresh_current(cell: Cell, threshold_voltage: float = -30.0) -
 def calculate_rheobase(cell: Cell,
                        threshold_voltage: float = -30.0,
                        threshold_search_stim_start: float = 300.0,
-                       threshold_search_stim_stop: float = 1000.0) -> float:
+                       threshold_search_stim_stop: float = 1000.0,
+                       section: str = "soma[0]",
+                       segx: float = 0.5) -> float:
     """Calculate the rheobase by first computing the upper bound threshold
     current.
 
@@ -400,6 +444,8 @@ def calculate_rheobase(cell: Cell,
         threshold_voltage (float, optional): Voltage threshold for spike detection. Default is -30.0 mV.
         threshold_search_stim_start (float, optional): Start time for threshold search stimulation (in ms). Default is 300.0 ms.
         threshold_search_stim_stop (float, optional): Stop time for threshold search stimulation (in ms). Default is 1000.0 ms.
+        section (str, optional): The section where current is injected.
+        segx (float, optional): Fractional location within the section for current injection.
 
     Returns:
         float: The rheobase current.
@@ -408,7 +454,12 @@ def calculate_rheobase(cell: Cell,
         raise ValueError("emodel_properties cannot be None")
 
     # Calculate upper bound threshold current
-    upperbound_threshold_current = calculate_max_thresh_current(cell, threshold_voltage)
+    upperbound_threshold_current = calculate_max_thresh_current(
+        cell,
+        threshold_voltage,
+        section,
+        segx
+    )
 
     # Compute rheobase
     rheobase = search_threshold_current(
@@ -422,6 +473,47 @@ def calculate_rheobase(cell: Cell,
         min_current=cell.template_params.emodel_properties.holding_current,
         max_current=upperbound_threshold_current,
         current_precision=0.005,
+        section=section,
+        segx=segx
     )
 
     return rheobase
+
+
+def validate_section_and_segment(cell: Cell, section_name: str, segment_position: float):
+    """Validate a single section and segment position.
+
+    Args:
+        cell: The cell model to validate against.
+        section_name: The name of the section to validate (e.g., 'soma', 'axon[1]').
+        segment_position: The position within the section (e.g., 0.5 for the middle).
+
+    Raises:
+        ValueError: If the section or position is invalid.
+    """
+    # Validate the section
+    if section_name not in cell.sections:
+        raise ValueError(f"Section '{section_name}' not found in the cell model.")
+
+    # Validate the segment position
+    if not (0.0 <= segment_position <= 1.0):
+        raise ValueError(f"Segment position must be between 0.0 and 1.0, got {segment_position}.")
+
+
+def get_section(cell: Cell, section_name: str) -> NeuronSection:
+    """Retrieve a NEURON section from the cell by its name.
+
+    Args:
+        cell (Cell): The cell object containing the sections.
+        section_name (str): The name of the section to retrieve.
+
+    Returns:
+        NeuronSection: The NEURON section corresponding to the provided name.
+
+    Raises:
+        ValueError: If the section with the specified name does not exist.
+    """
+    try:
+        return cell.sections[section_name]
+    except KeyError:
+        raise ValueError(f"Section '{section_name}' not found in the cell.")

{bluecellulab-2.6.40.dist-info → bluecellulab-2.6.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: bluecellulab
-Version: 2.6.40
+Version: 2.6.41
 Summary: Biologically detailed neural network simulations and analysis.
 Author: Blue Brain Project, EPFL
 License: Apache2.0

{bluecellulab-2.6.40.dist-info → bluecellulab-2.6.41.dist-info}/RECORD

@@ -10,17 +10,17 @@ bluecellulab/plotwindow.py,sha256=ePU-EegZ1Sqk0SoYYiQ6k24ZO4s3Hgfpx10uePiJ5xM,27
 bluecellulab/psection.py,sha256=FSOwRNuOTyB469BM-jPEf9l1J59FamXmzrQgBI6cnP4,6174
 bluecellulab/psegment.py,sha256=PTgoGLqM4oFIdF_8QHFQCU59j-8TQmtq6PakiGUQhIo,3138
 bluecellulab/rngsettings.py,sha256=2Ykb4Ylk3XTs58x1UIxjg8XJqjSpnCgKRZ8avXCDpxk,4237
-bluecellulab/tools.py,sha256=LgfP2NNm7dVbig2NFx3FFJXCbVpvK8BkighUoyKVPp8,14321
+bluecellulab/tools.py,sha256=pljNpD7dXvnKlgKoyc3YdGH3uDvhukWPHH7ausROwVM,17604
 bluecellulab/type_aliases.py,sha256=DvgjERv2Ztdw_sW63JrZTQGpJ0x5uMTFB5hcBHDb0WA,441
 bluecellulab/utils.py,sha256=SbOOkzw1YGjCKV3qOw0zpabNEy7V9BRtgMLsQJiFRq4,1526
 bluecellulab/verbosity.py,sha256=T0IgX7DrRo19faxrT4Xzb27gqxzoILQ8FzYKxvUeaPM,1342
 bluecellulab/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bluecellulab/analysis/analysis.py,sha256=i64iVNF7-0cCneKP4OjdyNHdhxtixjTFiJiSXK4FHLs,2508
-bluecellulab/analysis/inject_sequence.py,sha256=Ih3wdNRn0-lM-NW8agrMUGS862CEgzn_hl54DFDXyjM,6325
-bluecellulab/analysis/plotting.py,sha256=X2llERRPB9aDMbtw96RzMFfUQFXTKVMwmQ5lEkGWLlQ,791
+bluecellulab/analysis/analysis.py,sha256=ItRtUeXeIoYN6gkSZh-U5lBv-plClNZECU6y6YlaNCI,8615
+bluecellulab/analysis/inject_sequence.py,sha256=KlqkQO6gvXAPVkjh7t95rr6Ic-v3N2u04M_WUWtcL1o,8994
+bluecellulab/analysis/plotting.py,sha256=-ArjWHZsAlUoNSu_t0HQjQmFhGI1tCQtdAoICgwstFs,2588
 bluecellulab/cell/__init__.py,sha256=Sbc0QOsJ8E7tSwf3q7fsXuE_SevBN6ZmoCVyyU5zfII,208
 bluecellulab/cell/cell_dict.py,sha256=VE7pi-NsMVRSmo-PSdbiLYmolDOu0Gc6JxFBkuQpFdk,1346
-bluecellulab/cell/core.py,sha256=QzCC2uVj1yOSLi3-dGN3Iib9POTNRGNJSnjvJue1T5g,31315
+bluecellulab/cell/core.py,sha256=BualY0WOtC0arKmvKzQ3sQ0fhc2jrtd6wqSd9M-e25E,33797
 bluecellulab/cell/injector.py,sha256=p4e36Bmubm7uYfK0gvdEUeff18SE_4lZcRszRfqccWs,18042
 bluecellulab/cell/plotting.py,sha256=t2qDUabFtsBb-nJMkDh5UfsgW-wvQ2wfDwAVZ8-hWPo,4032
 bluecellulab/cell/random.py,sha256=pemekc11geRBKD8Ghb82tvKOZLfFWkUz1IKLc_NWg-A,1773
@@ -64,9 +64,9 @@ bluecellulab/stimulus/factory.py,sha256=L85RN-lImkyCEM87Pp1X5rpGNIHLNSMwx1b9dZxO
 bluecellulab/synapse/__init__.py,sha256=RW8XoAMXOvK7OG1nHl_q8jSEKLj9ZN4oWf2nY9HAwuk,192
 bluecellulab/synapse/synapse_factory.py,sha256=NHwRMYMrnRVm_sHmyKTJ1bdoNmWZNU4UPOGu7FCi-PE,6987
 bluecellulab/synapse/synapse_types.py,sha256=zs_yBvGTH4QrbQF3nEViidyq1WM_ZcTSFdjUxB3khW0,16871
-bluecellulab-2.6.40.dist-info/AUTHORS.txt,sha256=EDs3H-2HXBojbma10psixk3C2rFiOCTIREi2ZAbXYNQ,179
-bluecellulab-2.6.40.dist-info/LICENSE,sha256=dAMAR2Sud4Nead1wGFleKiwTZfkTNZbzmuGfcTKb3kg,11335
-bluecellulab-2.6.40.dist-info/METADATA,sha256=njZWcGPzkEh3qeWnbwZjBnnc_Fb4Dv6F41nWH5wNnL4,8213
-bluecellulab-2.6.40.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-bluecellulab-2.6.40.dist-info/top_level.txt,sha256=VSyEP8w9l3pXdRkyP_goeMwiNA8KWwitfAqUkveJkdQ,13
-bluecellulab-2.6.40.dist-info/RECORD,,
+bluecellulab-2.6.41.dist-info/AUTHORS.txt,sha256=EDs3H-2HXBojbma10psixk3C2rFiOCTIREi2ZAbXYNQ,179
+bluecellulab-2.6.41.dist-info/LICENSE,sha256=dAMAR2Sud4Nead1wGFleKiwTZfkTNZbzmuGfcTKb3kg,11335
+bluecellulab-2.6.41.dist-info/METADATA,sha256=8LgcqnSi_oOjFjuBet86o7KVyzqHVjkRodOfdAzw4iQ,8213
+bluecellulab-2.6.41.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+bluecellulab-2.6.41.dist-info/top_level.txt,sha256=VSyEP8w9l3pXdRkyP_goeMwiNA8KWwitfAqUkveJkdQ,13
+bluecellulab-2.6.41.dist-info/RECORD,,