From 352ca921140d08cb5adce02fd0da7876260b6cbb Mon Sep 17 00:00:00 2001 From: owinter Date: Tue, 12 Mar 2024 04:45:43 -0700 Subject: [PATCH 1/3] 2.32.4: register biasedCW tasks in extractors list --- ibllib/__init__.py | 2 +- ibllib/io/extractors/extractor_types.json | 5 ++++- release_notes.md | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ibllib/__init__.py b/ibllib/__init__.py index bda80755e..ebea0b785 100644 --- a/ibllib/__init__.py +++ b/ibllib/__init__.py @@ -2,7 +2,7 @@ import logging import warnings -__version__ = '2.32.3' +__version__ = '2.32.4' warnings.filterwarnings('always', category=DeprecationWarning, module='ibllib') # if this becomes a full-blown library we should let the logging configuration to the discretion of the dev diff --git a/ibllib/io/extractors/extractor_types.json b/ibllib/io/extractors/extractor_types.json index 71eea2bcf..fa1a80c7c 100644 --- a/ibllib/io/extractors/extractor_types.json +++ b/ibllib/io/extractors/extractor_types.json @@ -18,5 +18,8 @@ "_trainingChoiceWorld": "training", "ephysMockChoiceWorld": "mock_ephys", "ephys_certification": "sync_ephys", - "trainingPhaseChoiceWorld": "training" + "trainingPhaseChoiceWorld": "training", + "advancedChoiceWorld": "training", + "imagingChoiceWorld": "biased", + "neuromodulatorChoiceWorld": "biased" } diff --git a/release_notes.md b/release_notes.md index b04af15fa..2f98ffaa4 100644 --- a/release_notes.md +++ b/release_notes.md @@ -10,6 +10,9 @@ - FpgaTrials supports alignment of Bpod datasets not part of trials object - Support chained protocols in BehaviourPlots task +#### 2.32.4 +- Add support for variations of the biaseCW task in the json task description + ## Release Notes 2.31 ### features From a7e5a3c9f0c64b08cb2a25d50cae30eaf65d0bb5 Mon Sep 17 00:00:00 2001 From: owinter Date: Tue, 12 Mar 2024 07:17:43 -0700 Subject: [PATCH 2/3] revert deprecated extractor_types.json and update task_extractor_map.json instead --- ibllib/io/extractors/extractor_types.json | 4 ---- ibllib/io/extractors/task_extractor_map.json | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ibllib/io/extractors/extractor_types.json b/ibllib/io/extractors/extractor_types.json index fa1a80c7c..e4112d941 100644 --- a/ibllib/io/extractors/extractor_types.json +++ b/ibllib/io/extractors/extractor_types.json @@ -18,8 +18,4 @@ "_trainingChoiceWorld": "training", "ephysMockChoiceWorld": "mock_ephys", "ephys_certification": "sync_ephys", - "trainingPhaseChoiceWorld": "training", - "advancedChoiceWorld": "training", - "imagingChoiceWorld": "biased", - "neuromodulatorChoiceWorld": "biased" } diff --git a/ibllib/io/extractors/task_extractor_map.json b/ibllib/io/extractors/task_extractor_map.json index 2c3160265..5517702c0 100644 --- a/ibllib/io/extractors/task_extractor_map.json +++ b/ibllib/io/extractors/task_extractor_map.json @@ -2,5 +2,8 @@ "_biasedChoiceWorld": "BiasedTrials", "_habituationChoiceWorld": "HabituationTrials", "_trainingChoiceWorld": "TrainingTrials", - "_trainingPhaseChoiceWorld": "TrainingTrials" + "_trainingPhaseChoiceWorld": "TrainingTrials", + "_imagingChoiceWorld": "BiasedTrials", + "_advancedChoiceWorld": "TrainingTrials", + "_neuromodulatorChoiceWorld": "TrainingTrials" } From ad61bde241b8def7a8797b16517fd2ff95cd726e Mon Sep 17 00:00:00 2001 From: owinter Date: Tue, 12 Mar 2024 15:36:16 -0700 Subject: [PATCH 3/3] remove comma --- ibllib/io/extractors/extractor_types.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ibllib/io/extractors/extractor_types.json b/ibllib/io/extractors/extractor_types.json index e4112d941..e69e65270 100644 --- a/ibllib/io/extractors/extractor_types.json +++ b/ibllib/io/extractors/extractor_types.json @@ -17,5 +17,5 @@ "_habituationChoiceWorld": "habituation", "_trainingChoiceWorld": "training", "ephysMockChoiceWorld": "mock_ephys", - "ephys_certification": "sync_ephys", + "ephys_certification": "sync_ephys" }