Merge branch 'main' into mf

larsoner · Jan 10, 2024 · bcd5b73 · bcd5b73
2 parents 0ebf282 + d2c806c
commit bcd5b73
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/mne/epochs.py b/mne/epochs.py
@@ -2977,11 +2977,11 @@ def _ensure_list(x):
         *last_cols,
     ]
 
-    data = np.empty((len(events_df), len(columns)))
+    data = np.empty((len(events_df), len(columns)), float)
     metadata = pd.DataFrame(data=data, columns=columns, index=events_df.index)
 
     # Event names
-    metadata.iloc[:, 0] = ""
+    metadata["event_name"] = ""
 
     # Event times
     start_idx = 1
@@ -2990,7 +2990,7 @@ def _ensure_list(x):
 
     # keep_first and keep_last names
     start_idx = stop_idx
-    metadata.iloc[:, start_idx:] = None
+    metadata[columns[start_idx:]] = ""
 
     # We're all set, let's iterate over all events and fill in in the
     # respective cells in the metadata. We will subset this to include only