Merge pull request #64 from eurunuela/fix/time-locked

Fix time-locked ETS thresholding bug

Author: vinferrer

connPFM/connectivity/connectivity_utils.py

@@ -130,8 +130,7 @@ def calculate_hist(
 
 def calculate_hist_threshold(hist, bins, percentile=95):
     """Calculate histogram threshold."""
-    ets_hist_sum = np.sum(hist, axis=0)
-    cumsum_percentile = np.cumsum(ets_hist_sum) / np.sum(ets_hist_sum) * 100
+    cumsum_percentile = np.cumsum(hist) / np.sum(hist) * 100
     thr = bins[len(cumsum_percentile[cumsum_percentile <= percentile])]
 
     return thr
@@ -163,7 +162,9 @@ def surrogates_histogram(
 
     bin_edges = hist[0][1]
 
+    ets_hist_sum = np.sum(ets_hist, axis=0)
+
     # calculate histogram threshold
-    thr = calculate_hist_threshold(ets_hist, bin_edges, percentile)
+    thr = calculate_hist_threshold(ets_hist_sum, bin_edges, percentile)
 
     return thr

connPFM/connectivity/ev.py

@@ -108,7 +108,9 @@ def event_detection(
             idxpeak = idx
 
         # get co-fluctuation at peaks
-        etspeaks = connectivity_utils.threshold_ets_matrix(ets, thr=0, selected_idxs=idxpeak)
+        etspeaks = connectivity_utils.threshold_ets_matrix(
+            ets.copy(), thr=0, selected_idxs=idxpeak
+        )
 
     # Make selection of points with edge time-series matrix
     elif "ets" in peak_detection:
@@ -145,7 +147,7 @@ def event_detection(
                 )
 
         # Apply threshold on edge time-series matrix
-        etspeaks = connectivity_utils.threshold_ets_matrix(ets, thr)
+        etspeaks = connectivity_utils.threshold_ets_matrix(ets.copy(), thr)
         idxpeak = np.where(etspeaks != 0)[0]
         rss = np.sqrt(np.sum(np.square(etspeaks), axis=1))
     # calculate mean co-fluctuation (edge time series) across all peaks