Skip to content

Ensure gain correction always exists for NeuropixelsV2e devices #536

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
wants to merge 2 commits into
base: issue-505
Choose a base branch
from
Open

Ensure gain correction always exists for NeuropixelsV2e devices #536

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
728bc57
Refactor gain correction handling to ensure non-null values for probes
bparks13 Oct 29, 2025
0f8bf75
Indicate null state is an error, not incorrect user action
bparks13 Nov 3, 2025
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
6 changes: 3 additions & 3 deletions OpenEphys.Onix1/NeuropixelsV2eBetaData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ public unsafe override IObservable<NeuropixelsV2eBetaDataFrame> Generate()
.Where(frame => NeuropixelsV2eBetaDataFrame.GetProbeIndex(frame) == (int)ProbeIndex);
var invertPolarity = info.InvertPolarity;

var gainCorrection = ProbeIndex switch
double gainCorrection = ProbeIndex switch
{
NeuropixelsV2Probe.ProbeA => (double)info.GainCorrectionA,
NeuropixelsV2Probe.ProbeB => (double)info.GainCorrectionB,
NeuropixelsV2Probe.ProbeA => info.GainCorrectionA ?? throw new NullReferenceException($"Gain correction value is null for {ProbeIndex}."),
NeuropixelsV2Probe.ProbeB => info.GainCorrectionB ?? throw new NullReferenceException($"Gain correction value is null for {ProbeIndex}."),
_ => throw new InvalidEnumArgumentException($"Unexpected {nameof(ProbeIndex)} value: {ProbeIndex}")
};

Expand Down
6 changes: 3 additions & 3 deletions OpenEphys.Onix1/NeuropixelsV2eData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ public unsafe override IObservable<NeuropixelsV2eDataFrame> Generate()
.Where(frame => NeuropixelsV2eDataFrame.GetProbeIndex(frame) == (int)ProbeIndex);
var invertPolarity = info.InvertPolarity;

var gainCorrection = ProbeIndex switch
double gainCorrection = ProbeIndex switch
{
NeuropixelsV2Probe.ProbeA => (double)info.GainCorrectionA,
NeuropixelsV2Probe.ProbeB => (double)info.GainCorrectionB,
NeuropixelsV2Probe.ProbeA => info.GainCorrectionA ?? throw new NullReferenceException($"Gain correction value is null for {ProbeIndex}."),
NeuropixelsV2Probe.ProbeB => info.GainCorrectionB ?? throw new NullReferenceException($"Gain correction value is null for {ProbeIndex}."),
_ => throw new InvalidEnumArgumentException($"Unexpected {nameof(ProbeIndex)} value: {ProbeIndex}")
};

Expand Down