From 08d140a0b2b5f325315425c9a6fa1c6dcf7d7929 Mon Sep 17 00:00:00 2001
From: Eliot Qin <31031973+Baizhige@users.noreply.github.com>
Date: Sat, 21 Sep 2024 23:50:38 +0800
Subject: [PATCH] Baizhige/develop (#4)

* update debug directory

* Updates:

* update git ignore

* update ignore
---
 .gitignore                             | 4 ++--
 eegunity/module_eeg_batch/eeg_batch.py | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a8885b..5449e9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,5 +33,5 @@ dist/
 
 
 # ignore——debug
-locator/
-debug/
\ No newline at end of file
+/locator/
+/debug/
\ No newline at end of file
diff --git a/eegunity/module_eeg_batch/eeg_batch.py b/eegunity/module_eeg_batch/eeg_batch.py
index 658c4d8..d4607f2 100644
--- a/eegunity/module_eeg_batch/eeg_batch.py
+++ b/eegunity/module_eeg_batch/eeg_batch.py
@@ -124,7 +124,11 @@ def sample_filter(
 
         :param (tuple/list/array-like, optional) channel_number: A tuple or list with (min, max) values to filter the
             "Number of Channels" column. If None, this criterion is ignored. Default is None.
+<<<<<<< HEAD
+        :param (tuple/list/array-like, optional) sampling_rate: A tuple or list with (min, max) values to filter the
+=======
         :param (tuple/list/array-like, optional) sampling_rate : A tuple or list with (min, max) values to filter the
+>>>>>>> main
             "Sampling Rate" column. If None, this criterion is ignored. Default is None.
         :param (tuple/list/array-like, optional) duration: A tuple or list with (min, max) values to filter the
             "Duration" column. If None, this criterion is ignored. Default is None.
@@ -133,8 +137,7 @@ def sample_filter(
         :param (str, optional) domain_tag: A string to filter the "Domain Tag" column. If None, this criterion is ignored. Default is None.
         :param (str, optional) file_type: A string to filter the "File Type" column. If None, this criterion is ignored. Default is None.
 
-        Returns:
-        None. The function updates the 'locator' dataframe in the shared attributes.
+        :return (None): None
         """
 
         def con_func(row):