fixed aperiodic error estimate for mutliple channels

schmidtfa · Aug 27, 2024 · c7fe3c0 · c7fe3c0
1 parent 315860d
commit c7fe3c0
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 53 deletions.
diff --git a/examples/hset_optimization.ipynb b/examples/hset_optimization.ipynb
diff --git a/examples/irasa_mne.ipynb b/examples/irasa_mne.ipynb
@@ -203,7 +203,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [

diff --git a/pyrasa/utils/irasa_spectrum.py b/pyrasa/utils/irasa_spectrum.py
@@ -189,19 +189,24 @@ def get_aperiodic_error(self, peak_kwargs: None | dict = None) -> np.ndarray:
 
         if peak_kwargs is None:
             peak_kwargs = {}
+
+        aperiodic_errors = []
         # get absolute periodic spectrum
-        aperiodic_error = np.abs(self.periodic[0, :])
+        for ix in range(self.periodic.shape[0]):
+            aperiodic_error = np.abs(self.periodic[ix, :])
+
+            # zero-out peaks
+            peaks = self.get_peaks(**peak_kwargs)
+            freqs = self.freqs
 
-        # zero-out peaks
-        peaks = self.get_peaks(**peak_kwargs)
-        freqs = self.freqs
+            for _, peak in peaks.iterrows():
+                cur_upper = peak['cf'] + peak['bw']
+                cur_lower = peak['cf'] - peak['bw']
 
-        for _, peak in peaks.iterrows():
-            cur_upper = peak['cf'] + peak['bw']
-            cur_lower = peak['cf'] - peak['bw']
+                freq_mask = np.logical_and(freqs < cur_upper, freqs > cur_lower)
 
-            freq_mask = np.logical_and(freqs < cur_upper, freqs > cur_lower)
+                aperiodic_error[freq_mask] = 0
 
-            aperiodic_error[freq_mask] = 0
+            aperiodic_errors.append(aperiodic_error)
 
-        return aperiodic_error
+        return np.array(aperiodic_errors)