Skip to content

Commit

Permalink
Merge pull request #2006 from AllenInstitute/bugfix/2006-fix-test-error
Browse files Browse the repository at this point in the history
TestOperationPSXTooLargeDecayTau: Fix broken conflict resolution
  • Loading branch information
t-b authored Feb 14, 2024
2 parents f96f33f + 939e858 commit 77b2eee
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Packages/tests/Basic/UTF_SweepFormula_PSX.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ static Function TestOperationPSXTooLargeDecayTau()
win = CreateFakeSweepData(win, device, sweepNo = 0, sweepGen=FakeSweepDataGeneratorPSX)
win = CreateFakeSweepData(win, device, sweepNo = 2, sweepGen=FakeSweepDataGeneratorPSX)

str = "psx(myID, psxKernel([50, 150], select(channels(AD6), [0], all), 1, 15, -5), 1.5, 100, 0)"
str = "psx(myID, psxKernel([50, 150], select(channels(AD6), [0], all), 1, 15, -5), 10, 100, 0)"
WAVE/WAVE dataWref = SF_ExecuteFormula(str, win, useVariables = 0)
CHECK_WAVE(dataWref, WAVE_WAVE)

Expand Down

0 comments on commit 77b2eee

Please sign in to comment.