Skip to content

Commit d98ac2e

Browse files
authored
Merge pull request #577 from AllenInstitute/bugfix/sweep-formula-assert-out-on-invalid-data-range
Bugfix/sweep formula assert out on invalid data range
2 parents af9789e + efcd75f commit d98ac2e

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Packages/MIES/MIES_SweepFormula.ipf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,6 +1205,9 @@ static Function/WAVE SF_GetSweepForFormula(graph, range, channels, sweeps)
12051205
endif
12061206
ASSERT(!IsNaN(rangeStart) && !IsNaN(rangeEnd), "Specified range not valid.")
12071207

1208+
ASSERT(rangeStart == -inf || (IsFinite(rangeStart) && rangeStart >= leftx(sweep) && rangeStart < rightx(sweep)), "Specified starting range does not lie completely inside the sweep.")
1209+
ASSERT(rangeEnd == inf || (IsFinite(rangeEnd) && rangeEnd >= leftx(sweep) && rangeEnd < rightx(sweep)), "Specified ending range does not lie completely inside the sweep.")
1210+
12081211
pStart[i][j] = ScaleToIndexWrapper(sweep, rangeStart, ROWS)
12091212
pEnd[i][j] = ScaleToIndexWrapper(sweep, rangeEnd, ROWS)
12101213

0 commit comments

Comments
 (0)