Skip to content

Adds software events manual water #191

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

Merged
micahwoodard merged 2 commits into from
Sep 15, 2026
+71 −18
Merged

Adds software events manual water #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3102ce
adds software events manual water events
micahwoodard Sep 15, 2026
dfc8acb
updates description
micahwoodard Sep 15, 2026
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
61 changes: 43 additions & 18 deletions src/Extensions/Visualizers.bonsai
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<WorkflowBuilder Version="2.9.0"
<WorkflowBuilder Version="2.9.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:imvizui="clr-namespace:Bonsai.ImGui.Visualizers;assembly=Bonsai.ImGui.Visualizers.Design"
xmlns:imgui="clr-namespace:Bonsai.ImGui;assembly=Bonsai.ImGui"
Expand Down Expand Up @@ -958,7 +958,7 @@
</Combinator>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>GiveManualWaterRight</Name>
<Name>GiveRewardRight</Name>
</Expression>
<Expression xsi:type="WorkflowOutput" />
</Nodes>
Expand All @@ -985,7 +985,7 @@
</Combinator>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>GiveManualWaterRight</Name>
<Name>GiveRewardRight</Name>
</Expression>
<Expression xsi:type="WorkflowOutput" />
</Nodes>
Expand Down Expand Up @@ -1086,14 +1086,33 @@
<Expression xsi:type="MulticastSubject">
<Name>IsFlushingValveLeft</Name>
</Expression>
<Expression xsi:type="rx:BehaviorSubject" TypeArguments="sys:Boolean">
<rx:Name>GiveManualWaterRight</rx:Name>
<Expression xsi:type="SubscribeSubject">
<Name>UiCueGiveLeft</Name>
</Expression>
<Expression xsi:type="Unit" />
<Expression xsi:type="IncludeWorkflow" Path="Extensions\InlineSoftwareEvent.bonsai">
<EventName>GiveManualWaterRight</EventName>
<EventName>LeftManualAutoReward</EventName>
</Expression>
<Expression xsi:type="MulticastSubject">
<Name>GiveRewardRight</Name>
<Expression xsi:type="SubscribeSubject">
<Name>UiCueGiveRight</Name>
</Expression>
<Expression xsi:type="Unit" />
<Expression xsi:type="IncludeWorkflow" Path="Extensions\InlineSoftwareEvent.bonsai">
<EventName>RightManualAutoReward</EventName>
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>UiGiveRight</Name>
</Expression>
<Expression xsi:type="Unit" />
<Expression xsi:type="IncludeWorkflow" Path="Extensions\InlineSoftwareEvent.bonsai">
<EventName>RightManualWater</EventName>
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>UiGiveLeft</Name>
</Expression>
<Expression xsi:type="Unit" />
<Expression xsi:type="IncludeWorkflow" Path="Extensions\InlineSoftwareEvent.bonsai">
<EventName>LeftManualWater</EventName>
</Expression>
<Expression xsi:type="rx:BehaviorSubject" TypeArguments="sys:Boolean">
<rx:Name>IsFlushingValveLeft</rx:Name>
Expand Down Expand Up @@ -1722,24 +1741,30 @@
<Edge From="17" To="18" Label="Source1" />
<Edge From="19" To="20" Label="Source1" />
<Edge From="20" To="21" Label="Source1" />
<Edge From="24" To="26" Label="Source1" />
<Edge From="25" To="26" Label="Source2" />
<Edge From="25" To="30" Label="Source2" />
<Edge From="22" To="23" Label="Source1" />
<Edge From="23" To="24" Label="Source1" />
<Edge From="25" To="26" Label="Source1" />
<Edge From="26" To="27" Label="Source1" />
<Edge From="27" To="28" Label="Source1" />
<Edge From="28" To="29" Label="Source1" />
<Edge From="29" To="30" Label="Source1" />
<Edge From="30" To="31" Label="Source1" />
<Edge From="31" To="32" Label="Source1" />
<Edge From="33" To="35" Label="Source1" />
<Edge From="34" To="35" Label="Source2" />
<Edge From="34" To="40" Label="Source2" />
<Edge From="34" To="39" Label="Source2" />
<Edge From="35" To="36" Label="Source1" />
<Edge From="36" To="37" Label="Source1" />
<Edge From="37" To="38" Label="Source1" />
<Edge From="38" To="39" Label="Source1" />
<Edge From="39" To="40" Label="Source1" />
<Edge From="40" To="41" Label="Source1" />
<Edge From="41" To="42" Label="Source1" />
<Edge From="42" To="43" Label="Source1" />
<Edge From="42" To="44" Label="Source1" />
<Edge From="43" To="44" Label="Source2" />
<Edge From="43" To="49" Label="Source2" />
<Edge From="44" To="45" Label="Source1" />
<Edge From="45" To="46" Label="Source1" />
<Edge From="46" To="47" Label="Source1" />
<Edge From="48" To="49" Label="Source1" />
<Edge From="49" To="50" Label="Source1" />
<Edge From="50" To="51" Label="Source1" />
<Edge From="51" To="52" Label="Source1" />
</Edges>
</Workflow>
</Expression>
Expand Down
28 changes: 28 additions & 0 deletions src/aind_behavior_dynamic_foraging/data_contract/_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,34 @@ def make_dataset(
root_path / "behavior/SoftwareEvents/TrialMetrics.json"
),
),
SoftwareEvents(
name="LeftManualAutoReward",
description="An event emitted when the manual left auto reward is triggered. This manual reward is aligned with go cue.",
reader_params=SoftwareEvents.make_params(
root_path / "behavior/SoftwareEvents/LeftManualAutoReward.json"
),
),
SoftwareEvents(
name="RightManualAutoReward",
description="An event emitted when the manual right auto reward is triggered. This manual reward is aligned with go cue.",
reader_params=SoftwareEvents.make_params(
root_path / "behavior/SoftwareEvents/RightManualAutoReward.json"
),
),
SoftwareEvents(
name="RightManualWater",
description="An event emitted when the right manual water is triggered.",
reader_params=SoftwareEvents.make_params(
root_path / "behavior/SoftwareEvents/RightManualWater.json"
),
),
SoftwareEvents(
name="LeftManualWater",
description="An event emitted when the left manual water is triggered.",
reader_params=SoftwareEvents.make_params(
root_path / "behavior/SoftwareEvents/LeftManualWater.json"
),
),
SoftwareEvents(
name="GiveManualWaterRight",
description="An event emitted when manual water is given through visualizer. The value corresponds to whether water was delivered on the Right (True) or Left (False)",
Expand Down