From 9308323059d44e7908f32bd3a162679f4617ad85 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 14 Jul 2023 23:12:30 +0200 Subject: [PATCH 1/4] EP_FetchEpochs: Remove todo comment This was resolved in 137a5b2e (EP: Allow EP_FetchEpochs to retrieve epoch information from TTL channels, 2023-06-21). --- Packages/MIES/MIES_Epochs.ipf | 1 - 1 file changed, 1 deletion(-) diff --git a/Packages/MIES/MIES_Epochs.ipf b/Packages/MIES/MIES_Epochs.ipf index ca7da2375f..764502dc3a 100644 --- a/Packages/MIES/MIES_Epochs.ipf +++ b/Packages/MIES/MIES_Epochs.ipf @@ -994,7 +994,6 @@ End threadsafe Function/WAVE EP_FetchEpochs(WAVE numericalValues, WAVE/T/Z textualValues, variable sweep, variable channelNumber, variable channelType) variable index - /// @todo we don't yet write epoch info into the LBN if(channelType != XOP_CHANNEL_TYPE_DAC && channelType != XOP_CHANNEL_TYPE_TTL) return $"" endif From 64d09ac2a69890613fc66dba32da9191919f02f7 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 14 Jul 2023 23:23:31 +0200 Subject: [PATCH 2/4] UTF_TestNWBExportV2.ipf/TestTimeSeries: Check TTL epochs Forgotten in e55bb436 (EP: Add function EP_CollectEpochInfoTTL that creates epochs for TTL channels, 2023-06-22). --- Packages/tests/UTF_TestNWBExportV2.ipf | 31 +++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Packages/tests/UTF_TestNWBExportV2.ipf b/Packages/tests/UTF_TestNWBExportV2.ipf index 26acc5452d..c8fa6c47cf 100644 --- a/Packages/tests/UTF_TestNWBExportV2.ipf +++ b/Packages/tests/UTF_TestNWBExportV2.ipf @@ -518,26 +518,27 @@ static Function TestTimeSeries(fileID, filepath, device, groupID, channel, sweep FAIL() endif - // epochs - // @todo TTL support - if(params.channelType == XOP_CHANNEL_TYPE_DAC && clampMode != I_EQUAL_ZERO_MODE) + // introduced in 18e1406b (Labnotebook: Add DA/AD ChannelType, 2019-02-15) + [WAVE setting, index] = GetLastSettingChannel(numericalValues, $"", sweep, "DA ChannelType", params.channelNumber, params.channelType, DATA_ACQUISITION_MODE) - // introduced in 18e1406b (Labnotebook: Add DA/AD ChannelType, 2019-02-15) - [WAVE setting, index] = GetLastSettingChannel(numericalValues, $"", sweep, "DA ChannelType", params.channelNumber, params.channelType, DATA_ACQUISITION_MODE) + // epochs + if(((params.channelType == XOP_CHANNEL_TYPE_DAC \ + && clampMode != I_EQUAL_ZERO_MODE \ + && WaveExists(setting) \ + && setting[index] == DAQ_CHANNEL_TYPE_DAQ)) \ + || params.channelType == XOP_CHANNEL_TYPE_TTL) - if(WaveExists(setting) && setting[index] == DAQ_CHANNEL_TYPE_DAQ) - CHECK_WAVE(epochs, WAVE_WAVE) + CHECK_WAVE(epochs, WAVE_WAVE) - idx = FindDimlabel(epochs, ROWS, channel) - CHECK_GE_VAR(idx, 0) + idx = FindDimlabel(epochs, ROWS, channel) + CHECK_GE_VAR(idx, 0) - WAVE/T/Z epochsSingleChannel = WaveRef(epochs, row=idx) - CHECK_WAVE(epochsSingleChannel, TEXT_WAVE) + WAVE/T/Z epochsSingleChannel = WaveRef(epochs, row=idx) + CHECK_WAVE(epochsSingleChannel, TEXT_WAVE) - WAVE/Z epochsLBN = EP_FetchEpochs(numericalValues, textualValues, sweep, params.channelNumber, params.channelType) - CHECK_WAVE(epochsLBN, TEXT_WAVE) - CHECK_EQUAL_TEXTWAVES(epochsLBN, epochsSingleChannel) - endif + WAVE/Z epochsLBN = EP_FetchEpochs(numericalValues, textualValues, sweep, params.channelNumber, params.channelType) + CHECK_WAVE(epochsLBN, TEXT_WAVE) + CHECK_EQUAL_TEXTWAVES(epochsLBN, epochsSingleChannel) endif End From fe3b1defdd80bf1db5d675edd899c3cd0b78afa5 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 14 Jul 2023 23:31:57 +0200 Subject: [PATCH 3/4] .github/workflows: Avoid using deprecated action One of the latest pipeline runs shows The following actions uses node12 which is deprecated and will be forced to run on node16: actions/cache@v1. For more info: https://github.blog/changelog/2023-06-13-github-actions-all-actions-will-run-on-node16-instead-of-node12-by-default/ so let's move to v3. --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index bad06e9391..37b60d430c 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -75,7 +75,7 @@ jobs: # straight from the documentation, see https://pre-commit.com/#github-actions-example - name: set PY run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - - uses: actions/cache@v1 + - uses: actions/cache@v3 with: path: ~/.cache/pre-commit key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} From 7e3900382be40c7892d2ebfb69ddad651e21c0d4 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 14 Jul 2023 23:51:21 +0200 Subject: [PATCH 4/4] GetActiveChannelsTTL: Add introduction date of used LBN entries --- Packages/MIES/MIES_MiesUtilities.ipf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Packages/MIES/MIES_MiesUtilities.ipf b/Packages/MIES/MIES_MiesUtilities.ipf index f66b6cb35d..27a9312281 100644 --- a/Packages/MIES/MIES_MiesUtilities.ipf +++ b/Packages/MIES/MIES_MiesUtilities.ipf @@ -4746,6 +4746,7 @@ threadsafe static Function/WAVE GetActiveChannelsTTL(WAVE numericalValues, WAVE index = GetIndexForHeadstageIndepData(numericalValues) + // present since 2f56481a (DC_MakeNITTLWave: Document TTL settings and rework it completely, 2018-09-06) WAVE/T/Z ttlChannels = GetLastSetting(textualValues, sweep, "TTL channels", DATA_ACQUISITION_MODE) if(WaveExists(ttlChannels)) // NI hardware @@ -4772,6 +4773,9 @@ threadsafe static Function/WAVE GetActiveChannelsTTL(WAVE numericalValues, WAVE endif // ITC hardware + // + // LBN entries are present since c54d32a1 (Rework sweep settings + // labnotebook interaction and add TTL info, 2015-07-03) switch(TTLmode) case TTL_HARDWARE_CHANNEL: