From 7ce9c39ae87e7b3958007a1dc2cdb2f1b1533099 Mon Sep 17 00:00:00 2001
From: Diana <diana.stoll@stundent.uni-tuebingen.de>
Date: Wed, 23 Oct 2024 15:29:38 +0200
Subject: [PATCH] changed all_coming_together

---
 code/useful_functions.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/useful_functions.py b/code/useful_functions.py
index 6988861..39ba01e 100644
--- a/code/useful_functions.py
+++ b/code/useful_functions.py
@@ -427,12 +427,7 @@ def spike_times(stim):
     dt = ti.sampling_interval  
     return spikes, stim_dur, dt # se changed spike_times to spikes so its not the same as name of function
 
-
-<<<<<<< HEAD
 def valid_integrals(integral, local_mean, point, threshold = 0.1):
-=======
-def valid_integrals(integral, local_mean, point, threshold = 0.3):
->>>>>>> 3575361af10b14a99959f8aeb1b57a1e08d0446a
     """
     Check if the integral exceeds the threshold compared to the local mean and 
     provide feedback on whether the given point is valid or not.