From 06cf0d01a911b2401db002145976d83e9e76ca18 Mon Sep 17 00:00:00 2001 From: Mayo Faulkner Date: Wed, 30 Apr 2025 15:33:39 +0100 Subject: [PATCH 1/2] exclude wheelMoves amplitude and wheel position from build trials --- ibllib/io/extractors/ephys_fpga.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibllib/io/extractors/ephys_fpga.py b/ibllib/io/extractors/ephys_fpga.py index 6b2eba329..daf162418 100644 --- a/ibllib/io/extractors/ephys_fpga.py +++ b/ibllib/io/extractors/ephys_fpga.py @@ -666,7 +666,7 @@ def _update_var_names(self, bpod_fields=None, bpod_rsync_fields=None): self.bpod_rsync_fields += tuple(self._time_fields(table_keys)) elif bpod_rsync_fields: self.bpod_rsync_fields = bpod_rsync_fields - excluded = (*self.bpod_rsync_fields, 'table') + excluded = (*self.bpod_rsync_fields, 'table', 'wheel_position', 'wheelMoves_peakAmplitude') if bpod_fields: assert not set(self.bpod_fields).intersection(excluded), 'bpod_fields must not also be bpod_rsync_fields' self.bpod_fields = bpod_fields From 192d55caf6d03c9d00fa11f9f839d7a2d5f8d434 Mon Sep 17 00:00:00 2001 From: Mayo Faulkner Date: Wed, 30 Apr 2025 16:24:26 +0100 Subject: [PATCH 2/2] remove wheel from rsync_fields --- ibllib/io/extractors/ephys_fpga.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ibllib/io/extractors/ephys_fpga.py b/ibllib/io/extractors/ephys_fpga.py index daf162418..be5243627 100644 --- a/ibllib/io/extractors/ephys_fpga.py +++ b/ibllib/io/extractors/ephys_fpga.py @@ -658,7 +658,8 @@ def _update_var_names(self, bpod_fields=None, bpod_rsync_fields=None): self.settings = self.bpod_extractor.settings # This is used by the TaskQC self.bpod_rsync_fields = bpod_rsync_fields if self.bpod_rsync_fields is None: - self.bpod_rsync_fields = tuple(self._time_fields(self.bpod_extractor.var_names)) + self.bpod_rsync_fields = tuple([f for f in self._time_fields(self.bpod_extractor.var_names) + if 'wheel' not in f]) if 'table' in self.bpod_extractor.var_names: if not self.bpod_trials: self.bpod_trials = self.bpod_extractor.extract(save=False) @@ -666,7 +667,7 @@ def _update_var_names(self, bpod_fields=None, bpod_rsync_fields=None): self.bpod_rsync_fields += tuple(self._time_fields(table_keys)) elif bpod_rsync_fields: self.bpod_rsync_fields = bpod_rsync_fields - excluded = (*self.bpod_rsync_fields, 'table', 'wheel_position', 'wheelMoves_peakAmplitude') + excluded = (*self.bpod_rsync_fields, 'table', *(f for f in self.bpod_extractor.var_names if 'wheel' in f)) if bpod_fields: assert not set(self.bpod_fields).intersection(excluded), 'bpod_fields must not also be bpod_rsync_fields' self.bpod_fields = bpod_fields