From 449ec577d13aab0cbd1454a8fbeed843b3fcc674 Mon Sep 17 00:00:00 2001 From: Michael Huth Date: Tue, 18 Jul 2023 03:14:27 +0200 Subject: [PATCH] SF: Use EP_FetchEpochs in SF_OperationEpochsImpl instead of direct retrieval - use of generic utility function fot epoch fetching --- Packages/MIES/MIES_SweepFormula.ipf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Packages/MIES/MIES_SweepFormula.ipf b/Packages/MIES/MIES_SweepFormula.ipf index 56b2ad5013..5c56b10022 100644 --- a/Packages/MIES/MIES_SweepFormula.ipf +++ b/Packages/MIES/MIES_SweepFormula.ipf @@ -3013,15 +3013,11 @@ Static Function/WAVE SF_OperationEpochsImpl(string graph, WAVE/T epochPatterns, continue endif - [WAVE settings, settingsIndex] = GetLastSettingChannel(numericalValues, textualValues, sweepNo, EPOCHS_ENTRY_KEY, chanNr, chanType, DATA_ACQUISITION_MODE) - if(!WaveExists(settings)) + WAVE/Z/T epochInfo = EP_FetchEpochs(numericalValues, textualValues, sweepNo, chanNr, chanType) + if(!WaveExists(epochInfo)) continue endif - WAVE/T settingsT = settings - epEntry = settingsT[settingsIndex] - SFH_ASSERT(!IsEmpty(epEntry), "Encountered sweep/channel without epoch information.") - WAVE/T epochInfo = EP_EpochStrToWave(epEntry) WAVE/T epNames = SFH_GetEpochNamesFromInfo(epochInfo) WAVE/Z epIndices = SFH_GetEpochIndicesByWildcardPatterns(epNames, epochPatterns) if(!WaveExists(epIndices))