Skip to content

Commit ccd9675

Browse files
committed
Catch lingering RTEs for labnotebook reading/writing
This would have helped in debugging issue #2568.
1 parent 7d7904e commit ccd9675

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

Packages/MIES/MIES_ExperimentDocumentation.ipf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,10 @@ static Function ED_createTextNotes(WAVE/T incomingTextualValues, WAVE/T incoming
192192

193193
numCols = DimSize(incomingTextualValues, COLS)
194194
lastValidIncomingLayer = (DimSize(incomingTextualValues, LAYERS) == 0) ? 0 : (DimSize(incomingTextualValues, LAYERS) - 1)
195+
196+
AssertOnAndClearRTError()
195197
for(i = 0; i < numCols; i += 1)
196-
values[rowIndex][indizes[i]][0, lastValidIncomingLayer] = NormalizeToEOL(incomingTextualValues[0][i][r], "\n")
198+
values[rowIndex][indizes[i]][0, lastValidIncomingLayer] = NormalizeToEOL(incomingTextualValues[0][i][r], "\n"); AbortOnRTE
197199
endfor
198200

199201
SetNumberInWaveNote(values, NOTE_INDEX, rowIndex + 1)
@@ -295,8 +297,10 @@ static Function ED_createWaveNotes(WAVE incomingNumericalValues, WAVE/T incoming
295297

296298
numCols = DimSize(incomingNumericalValues, COLS)
297299
lastValidIncomingLayer = (DimSize(incomingNumericalValues, LAYERS) == 0) ? 0 : (DimSize(incomingNumericalValues, LAYERS) - 1)
300+
301+
AssertOnAndClearRTError()
298302
for(i = 0; i < numCols; i += 1)
299-
values[rowIndex][indizes[i]][0, lastValidIncomingLayer] = incomingNumericalValues[0][i][r]
303+
values[rowIndex][indizes[i]][0, lastValidIncomingLayer] = incomingNumericalValues[0][i][r]; AbortOnRTE
300304
endfor
301305

302306
SetNumberInWaveNote(values, NOTE_INDEX, rowIndex + 1)

Packages/MIES/MIES_MiesUtilities_Logbook.ipf

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -749,8 +749,10 @@ threadsafe Function/WAVE GetLastSettingNoCache(WAVE values, variable sweepNo, st
749749
endif
750750
endif
751751

752-
statusText[] = textualValues[i][settingCol][p]
753-
lengths[] = strlen(statusTexT[p])
752+
AssertOnAndClearRTError()
753+
statusText[] = textualValues[i][settingCol][p]; AbortOnRTE
754+
755+
lengths[] = strlen(statusTexT[p])
754756

755757
// return if we have at least one non-empty entry
756758
if(Sum(lengths) > 0)
@@ -848,7 +850,8 @@ threadsafe Function/WAVE GetLastSettingNoCache(WAVE values, variable sweepNo, st
848850
endif
849851
endif
850852

851-
status[] = numericalValues[i][settingCol][p]
853+
AssertOnAndClearRTError()
854+
status[] = numericalValues[i][settingCol][p]; AbortOnRTE
852855

853856
if(HasOneValidEntry(status))
854857
if(!ParamIsDefault(rowIndex))

0 commit comments

Comments
 (0)