Commit 109fded
committed
AD_FillWaves: Fix edge case with sweeps from different experiments
In ff131df (AD_FillWaves: Handle sweeps without analysis functions
better, 2022-08-08) we added better support for detecting ongoing sweeps
which don't have analysis functions attached.
That commit failed to see that when we are loading sweeps from different
experiments the last sweep from experiment B can not be found in the
labnotebook of the first experiment. And then lastSweepStimsetCycleIDs
is correctly an invalid wave ref.
Stepping back makes us realize that we only need to perform that check
when we are a databrowser as DAQ is never ongoing in the sweepbrowser.
While at it we also move fetching the SCI of the last sweep out of the
for loop.1 parent 4fd6439 commit 109fded
File tree
2 files changed
+29
-6
lines changed- Packages
- MIES
- tests/HistoricData
2 files changed
+29
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
219 | 219 | | |
220 | 220 | | |
221 | 221 | | |
222 | | - | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
223 | 225 | | |
224 | 226 | | |
225 | 227 | | |
226 | 228 | | |
| 229 | + | |
227 | 230 | | |
228 | 231 | | |
229 | 232 | | |
| |||
257 | 260 | | |
258 | 261 | | |
259 | 262 | | |
260 | | - | |
261 | | - | |
262 | 263 | | |
263 | 264 | | |
264 | 265 | | |
| |||
305 | 306 | | |
306 | 307 | | |
307 | 308 | | |
308 | | - | |
309 | | - | |
310 | | - | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
311 | 316 | | |
312 | 317 | | |
313 | 318 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
201 | 201 | | |
202 | 202 | | |
203 | 203 | | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
0 commit comments