fix t_starts bug in is_recruited and axon_AP_threshold

nrv-framework · Sep 17, 2024 · 8e0767a · 8e0767a
1 parent 41c1282
commit 8e0767a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/nrv/nmod/results/_axons_results.py b/nrv/nmod/results/_axons_results.py
@@ -326,7 +326,11 @@ def is_recruited(self, vm_key: str = "V_mem", t_start: float = None) -> bool:
                     self["recruited"] = n_aps
                 else:
                     _,t_starts = self.get_start_APs(vm_key= vm_key)
-                    self["recruited"] = len(t_starts>=t_start) > 0 
+                    #print(t_start)
+                    #print(t_starts)
+                    #print(t_starts[t_starts>=t_start])
+                    #print(len(t_starts[t_starts>=t_start])>0)
+                    self["recruited"] = len(t_starts[t_starts>=t_start])>0
             else:
                 self["recruited"] = n_aps
         return self["recruited"]

diff --git a/nrv/ui/_axon_simulations.py b/nrv/ui/_axon_simulations.py
@@ -140,7 +140,7 @@ def axon_AP_threshold(axon: axon, amp_max: float, update_func: Callable,
     current_amp = amp_max
     Niter = 1
     keep_going = 1
-    t_start = perf_counter()
+    t_start_cnt = perf_counter()
 
     while keep_going:
         if verbose and Niter == 1:
@@ -223,7 +223,7 @@ def axon_AP_threshold(axon: axon, amp_max: float, update_func: Callable,
     if verbose:
         clear_prompt_line(1)
         pass_info(f"Activation threshold is {np.round(current_amp,2)}µA ({np.round(current_tol,2)}%),"
-                  + f" found in {Niter-1} iterations ({np.round(t_stop-t_start,2)}s).")
+                  + f" found in {Niter-1} iterations ({np.round(t_stop-t_start_cnt,2)}s).")
     return current_amp
 
 def axon_block_threshold(axon: axon, amp_max: float, update_func: Callable, AP_start: float,
@@ -285,7 +285,7 @@ def axon_block_threshold(axon: axon, amp_max: float, update_func: Callable, AP_s
     current_amp = amp_max
     Niter = 1
     keep_going = 1
-    t_start = perf_counter()
+    t_start_cnt = perf_counter()
 
     while keep_going:
         if verbose and Niter == 1:
@@ -371,7 +371,7 @@ def axon_block_threshold(axon: axon, amp_max: float, update_func: Callable, AP_s
     if verbose:
         clear_prompt_line(1)
         pass_info(f"Block threshold is {np.round(current_amp,2)}µA ({np.round(current_tol,2)}%),"
-                  + f" found in {Niter-1} iterations ({np.round(t_stop-t_start,2)}s).")
+                  + f" found in {Niter-1} iterations ({np.round(t_stop-t_start_cnt,2)}s).")
     return current_amp
 
 def firing_threshold_point_source(