Skip to content

Commit

Permalink
SF: Use EP_FetchEpochs in SF_OperationEpochsImpl instead of direct re…
Browse files Browse the repository at this point in the history
…trieval

- use of generic utility function fot epoch fetching
  • Loading branch information
MichaelHuth committed Jul 27, 2023
1 parent 55d8a76 commit 449ec57
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions Packages/MIES/MIES_SweepFormula.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 449ec57

Please sign in to comment.