diff --git a/src/Extensions/PositionControl.bonsai b/src/Extensions/PositionControl.bonsai index be2cf5ba..4358d095 100644 --- a/src/Extensions/PositionControl.bonsai +++ b/src/Extensions/PositionControl.bonsai @@ -5,7 +5,6 @@ xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core" xmlns:harp="clr-namespace:Bonsai.Harp;assembly=Bonsai.Harp" xmlns:gl="clr-namespace:Bonsai.Shaders;assembly=Bonsai.Shaders" - xmlns:dsp="clr-namespace:Bonsai.Dsp;assembly=Bonsai.Dsp" xmlns:scr="clr-namespace:Bonsai.Scripting.Expressions;assembly=Bonsai.Scripting.Expressions" xmlns="https://bonsai-rx.org/2018/workflow"> @@ -151,47 +150,10 @@ CurrentPosition - EncoderSample - - - Value - - - InstantVelocity - - - TaskLogicParameters - - - OperationControl + FilteredCurrentVelocity - PositionControl.FrequencyFilterCutoff - - - - - - - - TreadmillSamplingRate - - - - - - - - - 250 - 5 - 0 - 60 - LowPass - - - - FilteredCurrentVelocity + Item1 StopVelocityThreshold @@ -210,7 +172,7 @@ - Seconds + Item2 @@ -294,31 +256,22 @@ - - - - + + + + - - + + - + - - + - - - - - - - - - - - + + + \ No newline at end of file diff --git a/src/Extensions/Visualizers.bonsai b/src/Extensions/Visualizers.bonsai index 8c401456..629a3fae 100644 --- a/src/Extensions/Visualizers.bonsai +++ b/src/Extensions/Visualizers.bonsai @@ -424,14 +424,26 @@ Item2.Item2 as SecondsSinceChoice) + + TaskLogicParameters + + + OperationControl + + + PositionControl.VelocityThreshold + StopVelocityThreshold + + + - Item1,Item2 + Item1.Item1,Item2 None 2 @@ -443,10 +455,14 @@ Item2.Item2 as SecondsSinceChoice) - - + + - + + + + + diff --git a/src/aind_behavior_vr_foraging/launcher.py b/src/aind_behavior_vr_foraging/launcher.py index 14ce0483..8b003c5f 100644 --- a/src/aind_behavior_vr_foraging/launcher.py +++ b/src/aind_behavior_vr_foraging/launcher.py @@ -91,6 +91,12 @@ def experiment(launcher: Launcher) -> None: ads_rig.write_standard_file(launcher.session_directory) # Watchdog + is_transfer = picker.ui_helper.prompt_yes_no_question("Would you like to transfer data?") + if not is_transfer: + logger.info("Data transfer skipped by user.") + launcher.copy_logs() + return + launcher.copy_logs() watchdog_settings = WatchdogSettings() watchdog_settings.destination = Path(watchdog_settings.destination) / launcher.session.subject diff --git a/src/main.bonsai b/src/main.bonsai index 45dd9497..61bc7f8d 100644 --- a/src/main.bonsai +++ b/src/main.bonsai @@ -1389,7 +1389,7 @@ Item3 as Right) StopVelocityThreshold - + FilteredCurrentVelocity @@ -4376,6 +4376,55 @@ Item1 as Displacement, + + EncoderSample + + + Value + + + InstantVelocity + + + TaskLogicParameters + + + OperationControl + + + PositionControl.FrequencyFilterCutoff + + + + + + + + TreadmillSamplingRate + + + + + + + + + 250 + 5 + 0 + 60 + LowPass + + + + Seconds + + + + + + FilteredCurrentVelocity + @@ -4410,6 +4459,19 @@ Item1 as Displacement, + + + + + + + + + + + + +