From 3e401f1758a1ce9523e6298ebbdadef2c59990d4 Mon Sep 17 00:00:00 2001 From: kushalbakshi Date: Fri, 1 Nov 2024 15:00:35 -0400 Subject: [PATCH] Remove merge conflict-resolution change --- element_array_ephys/ephys_acute.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/element_array_ephys/ephys_acute.py b/element_array_ephys/ephys_acute.py index 54a322b5..f93a66a4 100644 --- a/element_array_ephys/ephys_acute.py +++ b/element_array_ephys/ephys_acute.py @@ -180,10 +180,7 @@ def auto_generate_entries(cls, session_key): "probe_type": spikeglx_meta.probe_model, "probe": spikeglx_meta.probe_SN, } - if ( - probe_key["probe"] not in [p["probe"] for p in probe_list] - and probe_key not in probe.Probe() - ): + if probe_key["probe"] not in [p["probe"] for p in probe_list]: probe_list.append(probe_key) probe_dir = meta_filepath.parent @@ -207,10 +204,7 @@ def auto_generate_entries(cls, session_key): "probe_type": oe_probe.probe_model, "probe": oe_probe.probe_SN, } - if ( - probe_key["probe"] not in [p["probe"] for p in probe_list] - and probe_key not in probe.Probe() - ): + if probe_key["probe"] not in [p["probe"] for p in probe_list]: probe_list.append(probe_key) probe_insertion_list.append( {