Merge branch 'new_conductance_source' of github.com:BlueBrain/neuroda…

…mus into new_conductance_source Conflicts: neurodamus/core/stimuli.py neurodamus/stimulus_manager.py
BlueBrain · Feb 28, 2024 · 8d65f18 · 8d65f18
2 parents b5b2c1e + 0c8467d
commit 8d65f18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/neurodamus/core/stimuli.py b/neurodamus/core/stimuli.py
@@ -356,7 +356,7 @@ def shot_noise(cls, tau_D, tau_R, rate, amp_mean, var, duration, dt=0.25, base_a
 
     @classmethod
     def ornstein_uhlenbeck(cls, tau, sigma, mean, duration, dt=0.25, base_amp=.0, **kw):
-        return cls(base_amp, **kw).add_ornstein_uhlenbeck(tau, sigma, mean,duration, dt)
+        return cls(base_amp, **kw).add_ornstein_uhlenbeck(tau, sigma, mean, duration, dt)
 
     # Operations
     def __add__(self, other):
@@ -437,9 +437,7 @@ def __init__(self, cell_section, position=0.5, clamp_container=None,
 
             # Checks if new conductanceSource mechanism is available 
             if hasattr(Nd.h,"conductanceSource"):
-
                 self.clamp = Neuron.h.conductanceSource(position, sec=cell_section)
-
             else:
                 self.clamp = Neuron.h.SEClamp(position, sec=cell_section)
 

diff --git a/neurodamus/stimulus_manager.py b/neurodamus/stimulus_manager.py
@@ -758,8 +758,9 @@ def __init__(self, target, stim_info: dict, cell_manager):
                 if hasattr(Nd.h,"conductanceSource"):              
                     seclamp = Nd.h.conductanceSource(tpoint_list.x[sec_id], sec=sc.sec)
                 else:
+                    # create single electrode voltage clamp at location
                     seclamp = Nd.h.SEClamp(tpoint_list.x[sec_id], sec=sc.sec)
-                
+
                 seclamp.rs = self.rs
                 seclamp.dur1 = self.duration
                 seclamp.amp1 = self.vhold