Skip to content

Commit 29d4100

Browse files
bruno-f-cruzbruno-f-cruz
committed
Remove spout retraction as a feature of the task
1 parent 911f048 commit 29d4100

20 files changed

Lines changed: 90 additions & 940 deletions

‎examples/task_mcm.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ def compute_cmc_transition_probability(n_states, rep_rate, T=3.5, dt=0.1) -> np.
5858

5959

6060
operation_control = vr_task_logic.OperationControl(
61-
movable_spout_control=vr_task_logic.MovableSpoutControl(enabled=False),
6261
audio_control=vr_task_logic.AudioControl(duration=0.2, frequency=9999),
6362
odor_control=vr_task_logic.OdorControl(),
6463
position_control=vr_task_logic.PositionControl(

‎examples/task_patch_foraging.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ def NumericalUpdaterParametersHelper(
3434
}
3535

3636
operation_control = vr_task_logic.OperationControl(
37-
movable_spout_control=vr_task_logic.MovableSpoutControl(
38-
enabled=True,
39-
time_to_collect_after_reward=1,
40-
retracting_distance=2000,
41-
),
4237
audio_control=vr_task_logic.AudioControl(frequency=1000, duration=0.2),
4338
odor_control=vr_task_logic.OdorControl(
4439
target_odor_flow=100, target_total_flow=1000, use_channel_3_as_carrier=True

‎examples/test_single_site_patch.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ def make_block(
181181

182182

183183
operation_control = vr_task_logic.OperationControl(
184-
movable_spout_control=vr_task_logic.MovableSpoutControl(enabled=False),
185184
audio_control=vr_task_logic.AudioControl(duration=0.2, frequency=9999),
186185
odor_control=vr_task_logic.OdorControl(),
187186
position_control=vr_task_logic.PositionControl(

‎schema/aind_behavior_vr_foraging.json‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -579,11 +579,6 @@
579579
"duration": 0.2,
580580
"frequency": 9999.0
581581
},
582-
"movable_spout_control": {
583-
"enabled": false,
584-
"retracting_distance": 0.0,
585-
"time_to_collect_after_reward": 1.0
586-
},
587582
"odor_control": {
588583
"target_odor_flow": 100,
589584
"target_total_flow": 1000
@@ -805,11 +800,6 @@
805800
"operation_control": {
806801
"$ref": "#/$defs/OperationControl",
807802
"default": {
808-
"movable_spout_control": {
809-
"enabled": false,
810-
"retracting_distance": 0.0,
811-
"time_to_collect_after_reward": 1.0
812-
},
813803
"odor_control": {
814804
"target_odor_flow": 100,
815805
"target_total_flow": 1000
@@ -2814,33 +2804,6 @@
28142804
],
28152805
"x-sgen-typename": "AllenNeuralDynamics.AindManipulator.MotorOperationMode"
28162806
},
2817-
"MovableSpoutControl": {
2818-
"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.",
2819-
"properties": {
2820-
"enabled": {
2821-
"default": false,
2822-
"description": "Whether the movable spout is enabled",
2823-
"title": "Enabled",
2824-
"type": "boolean"
2825-
},
2826-
"time_to_collect_after_reward": {
2827-
"default": 1,
2828-
"description": "Time (s) to collect after reward",
2829-
"minimum": 0,
2830-
"title": "Time To Collect After Reward",
2831-
"type": "number"
2832-
},
2833-
"retracting_distance": {
2834-
"default": 0,
2835-
"description": "The distance, relative to the default position, the spout will be retracted by",
2836-
"minimum": 0,
2837-
"title": "Retracting Distance",
2838-
"type": "number"
2839-
}
2840-
},
2841-
"title": "MovableSpoutControl",
2842-
"type": "object"
2843-
},
28442807
"NormalDistribution": {
28452808
"description": "A normal (Gaussian) probability distribution.\n\nBell-shaped distribution symmetric around the mean, commonly used\nfor modeling naturally occurring random variables.",
28462809
"properties": {
@@ -3286,17 +3249,8 @@
32863249
"type": "object"
32873250
},
32883251
"OperationControl": {
3289-
"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.",
3252+
"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.",
32903253
"properties": {
3291-
"movable_spout_control": {
3292-
"$ref": "#/$defs/MovableSpoutControl",
3293-
"default": {
3294-
"enabled": false,
3295-
"time_to_collect_after_reward": 1.0,
3296-
"retracting_distance": 0.0
3297-
},
3298-
"description": "Control of the movable spout"
3299-
},
33003254
"odor_control": {
33013255
"$ref": "#/$defs/OdorControl",
33023256
"default": {

‎schema/depletion.json‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,6 @@
276276
"sampling_mode": "Sequential"
277277
},
278278
"operation_control": {
279-
"movable_spout_control": {
280-
"enabled": false,
281-
"time_to_collect_after_reward": 1.0,
282-
"retracting_distance": 0.0
283-
},
284279
"odor_control": {
285280
"target_total_flow": 1000,
286281
"target_odor_flow": 100
@@ -631,11 +626,6 @@
631626
"sampling_mode": "Sequential"
632627
},
633628
"operation_control": {
634-
"movable_spout_control": {
635-
"enabled": false,
636-
"time_to_collect_after_reward": 1.0,
637-
"retracting_distance": 0.0
638-
},
639629
"odor_control": {
640630
"target_total_flow": 1000,
641631
"target_odor_flow": 100
@@ -974,11 +964,6 @@
974964
"sampling_mode": "Sequential"
975965
},
976966
"operation_control": {
977-
"movable_spout_control": {
978-
"enabled": false,
979-
"time_to_collect_after_reward": 1.0,
980-
"retracting_distance": 0.0
981-
},
982967
"odor_control": {
983968
"target_total_flow": 1000,
984969
"target_odor_flow": 100
@@ -1476,11 +1461,6 @@
14761461
"sampling_mode": "Sequential"
14771462
},
14781463
"operation_control": {
1479-
"movable_spout_control": {
1480-
"enabled": false,
1481-
"time_to_collect_after_reward": 1.0,
1482-
"retracting_distance": 0.0
1483-
},
14841464
"odor_control": {
14851465
"target_total_flow": 1000,
14861466
"target_odor_flow": 100
@@ -2198,11 +2178,6 @@
21982178
"sampling_mode": "Sequential"
21992179
},
22002180
"operation_control": {
2201-
"movable_spout_control": {
2202-
"enabled": false,
2203-
"time_to_collect_after_reward": 1.0,
2204-
"retracting_distance": 0.0
2205-
},
22062181
"odor_control": {
22072182
"target_total_flow": 1000,
22082183
"target_odor_flow": 100

‎schema/depletion_stops_offset.json‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,6 @@
276276
"sampling_mode": "Sequential"
277277
},
278278
"operation_control": {
279-
"movable_spout_control": {
280-
"enabled": false,
281-
"time_to_collect_after_reward": 1.0,
282-
"retracting_distance": 0.0
283-
},
284279
"odor_control": {
285280
"target_total_flow": 1000,
286281
"target_odor_flow": 100
@@ -631,11 +626,6 @@
631626
"sampling_mode": "Sequential"
632627
},
633628
"operation_control": {
634-
"movable_spout_control": {
635-
"enabled": false,
636-
"time_to_collect_after_reward": 1.0,
637-
"retracting_distance": 0.0
638-
},
639629
"odor_control": {
640630
"target_total_flow": 1000,
641631
"target_odor_flow": 100
@@ -974,11 +964,6 @@
974964
"sampling_mode": "Sequential"
975965
},
976966
"operation_control": {
977-
"movable_spout_control": {
978-
"enabled": false,
979-
"time_to_collect_after_reward": 1.0,
980-
"retracting_distance": 0.0
981-
},
982967
"odor_control": {
983968
"target_total_flow": 1000,
984969
"target_odor_flow": 100
@@ -1476,11 +1461,6 @@
14761461
"sampling_mode": "Sequential"
14771462
},
14781463
"operation_control": {
1479-
"movable_spout_control": {
1480-
"enabled": false,
1481-
"time_to_collect_after_reward": 1.0,
1482-
"retracting_distance": 0.0
1483-
},
14841464
"odor_control": {
14851465
"target_total_flow": 1000,
14861466
"target_odor_flow": 100
@@ -2198,11 +2178,6 @@
21982178
"sampling_mode": "Sequential"
21992179
},
22002180
"operation_control": {
2201-
"movable_spout_control": {
2202-
"enabled": false,
2203-
"time_to_collect_after_reward": 1.0,
2204-
"retracting_distance": 0.0
2205-
},
22062181
"odor_control": {
22072182
"target_total_flow": 1000,
22082183
"target_odor_flow": 100

‎schema/depletion_stops_rate.json‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,6 @@
276276
"sampling_mode": "Sequential"
277277
},
278278
"operation_control": {
279-
"movable_spout_control": {
280-
"enabled": false,
281-
"time_to_collect_after_reward": 1.0,
282-
"retracting_distance": 0.0
283-
},
284279
"odor_control": {
285280
"target_total_flow": 1000,
286281
"target_odor_flow": 100
@@ -631,11 +626,6 @@
631626
"sampling_mode": "Sequential"
632627
},
633628
"operation_control": {
634-
"movable_spout_control": {
635-
"enabled": false,
636-
"time_to_collect_after_reward": 1.0,
637-
"retracting_distance": 0.0
638-
},
639629
"odor_control": {
640630
"target_total_flow": 1000,
641631
"target_odor_flow": 100
@@ -974,11 +964,6 @@
974964
"sampling_mode": "Sequential"
975965
},
976966
"operation_control": {
977-
"movable_spout_control": {
978-
"enabled": false,
979-
"time_to_collect_after_reward": 1.0,
980-
"retracting_distance": 0.0
981-
},
982967
"odor_control": {
983968
"target_total_flow": 1000,
984969
"target_odor_flow": 100
@@ -1476,11 +1461,6 @@
14761461
"sampling_mode": "Sequential"
14771462
},
14781463
"operation_control": {
1479-
"movable_spout_control": {
1480-
"enabled": false,
1481-
"time_to_collect_after_reward": 1.0,
1482-
"retracting_distance": 0.0
1483-
},
14841464
"odor_control": {
14851465
"target_total_flow": 1000,
14861466
"target_odor_flow": 100
@@ -2198,11 +2178,6 @@
21982178
"sampling_mode": "Sequential"
21992179
},
22002180
"operation_control": {
2201-
"movable_spout_control": {
2202-
"enabled": false,
2203-
"time_to_collect_after_reward": 1.0,
2204-
"retracting_distance": 0.0
2205-
},
22062181
"odor_control": {
22072182
"target_total_flow": 1000,
22082183
"target_odor_flow": 100

‎schema/deterministic_reversals.json‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,6 @@
276276
"sampling_mode": "Sequential"
277277
},
278278
"operation_control": {
279-
"movable_spout_control": {
280-
"enabled": false,
281-
"time_to_collect_after_reward": 1.0,
282-
"retracting_distance": 0.0
283-
},
284279
"odor_control": {
285280
"target_total_flow": 1000,
286281
"target_odor_flow": 100
@@ -631,11 +626,6 @@
631626
"sampling_mode": "Sequential"
632627
},
633628
"operation_control": {
634-
"movable_spout_control": {
635-
"enabled": false,
636-
"time_to_collect_after_reward": 1.0,
637-
"retracting_distance": 0.0
638-
},
639629
"odor_control": {
640630
"target_total_flow": 1000,
641631
"target_odor_flow": 100
@@ -974,11 +964,6 @@
974964
"sampling_mode": "Sequential"
975965
},
976966
"operation_control": {
977-
"movable_spout_control": {
978-
"enabled": false,
979-
"time_to_collect_after_reward": 1.0,
980-
"retracting_distance": 0.0
981-
},
982967
"odor_control": {
983968
"target_total_flow": 1000,
984969
"target_odor_flow": 100
@@ -1490,11 +1475,6 @@
14901475
"sampling_mode": "Sequential"
14911476
},
14921477
"operation_control": {
1493-
"movable_spout_control": {
1494-
"enabled": false,
1495-
"time_to_collect_after_reward": 1.0,
1496-
"retracting_distance": 0.0
1497-
},
14981478
"odor_control": {
14991479
"target_total_flow": 1000,
15001480
"target_odor_flow": 100
@@ -2231,11 +2211,6 @@
22312211
"sampling_mode": "Sequential"
22322212
},
22332213
"operation_control": {
2234-
"movable_spout_control": {
2235-
"enabled": false,
2236-
"time_to_collect_after_reward": 1.0,
2237-
"retracting_distance": 0.0
2238-
},
22392214
"odor_control": {
22402215
"target_total_flow": 1000,
22412216
"target_odor_flow": 100

0 commit comments

Comments
 (0)