Merge branch 'sp_tonotopic' of https://github.com/int-brain-lab/project_extraction into sp_tonotopic

Author: bimac

iblrig_custom_tasks/samuel_tonotopicMapping/task.py

@@ -24,8 +24,8 @@ class Session(BpodMixin, BaseSession):
     protocol_name = 'samuel_tonotopicMapping'
     TrialDataModel = TonotopicMappingTrialData
 
-    frequencies: list[int] = []
-    sequence: list[int] = []
+    frequencies: np.ndarray = np.array([])
+    sequence: np.ndarray = np.array([])
     trial_num: int = -1
 
     def __init__(self, *args, **kwargs):
@@ -114,7 +114,7 @@ def start_mixin_sound(self):
             bpod_action = (module_port, self.bpod._define_message(self.bpod.sound_card, bpod_message))
             self.bpod.actions.update({f'freq_{frequency_idx}': bpod_action})
 
-        self.bpod.softcode_handler_function = Session.softcode_handler
+        self.bpod.softcode_handler_function = self.softcode_handler
 
     def start_hardware(self):
         self.start_mixin_bpod()
@@ -145,7 +145,7 @@ def get_state_machine(self, trial_number: int) -> StateMachine:
 
         # build state machine
         sma = StateMachine(self.bpod)
-        for state_idx, frequency_idx in enumerate(Session.sequence):
+        for state_idx, frequency_idx in enumerate(self.sequence):
             sma.add_state(
                 state_name=self.get_state_name(state_idx),
                 state_timer=self.task_params['d_sound'] + self.task_params['d_pause'],

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "project_extraction"
-version         = "0.8.4"
+version         = "0.9.0"
 description     = "Custom extractors for satellite tasks"
 dynamic         = [ "readme" ]
 keywords        = [ "IBL", "neuro-science" ]
@@ -24,11 +24,6 @@ readme = { file = "README.md", content-type = "text/markdown" }
 find = {}
 
 [tool.ruff]
-ignore = [
-    "PLR0912", # Too many branches
-    "PLR0915", # Too many statements
-    "PLR2004", # Magic value used in comparison, consider replacing with a constant variable
-]
 exclude = [
     ".mypy_cache",
     "dist",
@@ -52,6 +47,11 @@ select = [
     "SIM", # flake8-simplify
     "UP",  # pyupgrade
 ]
+ignore = [
+    "PLR0912", # Too many branches
+    "PLR0915", # Too many statements
+    "PLR2004", # Magic value used in comparison, consider replacing with a constant variable
+]
 
 [tool.ruff.format]
 quote-style = "single"