Skip to content

Remove spout retraction as a feature of the task #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bruno-f-cruz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove spout retraction as a feature of the task #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/task_mcm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ def compute_cmc_transition_probability(n_states, rep_rate, T=3.5, dt=0.1) -> np.


operation_control = vr_task_logic.OperationControl(
movable_spout_control=vr_task_logic.MovableSpoutControl(enabled=False),
audio_control=vr_task_logic.AudioControl(duration=0.2, frequency=9999),
odor_control=vr_task_logic.OdorControl(),
position_control=vr_task_logic.PositionControl(
Expand Down
5 changes: 0 additions & 5 deletions examples/task_patch_foraging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ def NumericalUpdaterParametersHelper(
}

operation_control = vr_task_logic.OperationControl(
movable_spout_control=vr_task_logic.MovableSpoutControl(
enabled=True,
time_to_collect_after_reward=1,
retracting_distance=2000,
),
audio_control=vr_task_logic.AudioControl(frequency=1000, duration=0.2),
odor_control=vr_task_logic.OdorControl(
target_odor_flow=100, target_total_flow=1000, use_channel_3_as_carrier=True
Expand Down
1 change: 0 additions & 1 deletion examples/test_single_site_patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ def make_block(


operation_control = vr_task_logic.OperationControl(
movable_spout_control=vr_task_logic.MovableSpoutControl(enabled=False),
audio_control=vr_task_logic.AudioControl(duration=0.2, frequency=9999),
odor_control=vr_task_logic.OdorControl(),
position_control=vr_task_logic.PositionControl(
Expand Down
48 changes: 1 addition & 47 deletions schema/aind_behavior_vr_foraging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,11 +579,6 @@
"duration": 0.2,
"frequency": 9999.0
},
"movable_spout_control": {
"enabled": false,
"retracting_distance": 0.0,
"time_to_collect_after_reward": 1.0
},
"odor_control": {
"target_odor_flow": 100,
"target_total_flow": 1000
Expand Down Expand Up @@ -805,11 +800,6 @@
"operation_control": {
"$ref": "#/$defs/OperationControl",
"default": {
"movable_spout_control": {
"enabled": false,
"retracting_distance": 0.0,
"time_to_collect_after_reward": 1.0
},
"odor_control": {
"target_odor_flow": 100,
"target_total_flow": 1000
Expand Down Expand Up @@ -2814,33 +2804,6 @@
],
"x-sgen-typename": "AllenNeuralDynamics.AindManipulator.MotorOperationMode"
},
"MovableSpoutControl": {
"description": "Controls the movable water spout behavior for reward delivery.\n\nThis class configures how the movable spout operates, including when it's\nenabled, timing for reward collection, and retraction distance for operant\nconditioning protocols.",
"properties": {
"enabled": {
"default": false,
"description": "Whether the movable spout is enabled",
"title": "Enabled",
"type": "boolean"
},
"time_to_collect_after_reward": {
"default": 1,
"description": "Time (s) to collect after reward",
"minimum": 0,
"title": "Time To Collect After Reward",
"type": "number"
},
"retracting_distance": {
"default": 0,
"description": "The distance, relative to the default position, the spout will be retracted by",
"minimum": 0,
"title": "Retracting Distance",
"type": "number"
}
},
"title": "MovableSpoutControl",
"type": "object"
},
"NormalDistribution": {
"description": "A normal (Gaussian) probability distribution.\n\nBell-shaped distribution symmetric around the mean, commonly used\nfor modeling naturally occurring random variables.",
"properties": {
Expand Down Expand Up @@ -3286,17 +3249,8 @@
"type": "object"
},
"OperationControl": {
"description": "Master control class for all operational hardware systems.\n\nThis class aggregates all the hardware control specifications including\nmovable spout, odor delivery, position tracking, and audio systems.\nIt provides a centralized configuration point for all task hardware.",
"description": "Master control class for all operational hardware systems.\n\nThis class aggregates all the hardware control specifications including\nodor delivery, position tracking, and audio systems.\nIt provides a centralized configuration point for all task hardware.",
"properties": {
"movable_spout_control": {
"$ref": "#/$defs/MovableSpoutControl",
"default": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"description": "Control of the movable spout"
},
"odor_control": {
"$ref": "#/$defs/OdorControl",
"default": {
Expand Down
25 changes: 0 additions & 25 deletions schema/depletion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -631,11 +626,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -974,11 +964,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -1476,11 +1461,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -2198,11 +2178,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down
25 changes: 0 additions & 25 deletions schema/depletion_stops_offset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -631,11 +626,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -974,11 +964,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -1476,11 +1461,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -2198,11 +2178,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down
25 changes: 0 additions & 25 deletions schema/depletion_stops_rate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -631,11 +626,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -974,11 +964,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -1476,11 +1461,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -2198,11 +2178,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down
25 changes: 0 additions & 25 deletions schema/deterministic_reversals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -631,11 +626,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -974,11 +964,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -1490,11 +1475,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down Expand Up @@ -2231,11 +2211,6 @@
"sampling_mode": "Sequential"
},
"operation_control": {
"movable_spout_control": {
"enabled": false,
"time_to_collect_after_reward": 1.0,
"retracting_distance": 0.0
},
"odor_control": {
"target_total_flow": 1000,
"target_odor_flow": 100
Expand Down
Loading