NWB_AppendSweepLowLevel: Fix exporting TTL epoch information for ITC …

…hardware

Since 2637e08 (Add channel types support to EpochsWave as chunk index,
2023-07-07) we have support for exporting epoch information of TTL
channels into NWBv2.

Unfortunately that commit failed to realize that we have to export TTL
information per ttlBit for ITC hardware. As the tests were also wrong,
this was found until now with the ITC1600 tests.

Packages/MIES/MIES_NeuroDataWithoutBorders.ipf

@@ -1170,8 +1170,6 @@ threadsafe static Function NWB_AppendSweepLowLevel(STRUCT NWBAsyncParameters &s)
 		col                     = AFH_GetDAQDataColumn(s.DAQConfigWave, params.channelNumber, params.channelType)
 		writtenDataColumns[col] = 1
 
-		WAVE/T/Z params.epochs = EP_FetchEpochs(s.numericalValues, s.textualValues, s.sweep, params.channelNumber, params.channelType)
-
 		WAVE data = ExtractOneDimDataFromSweep(s.DAQConfigWave, s.DAQDataWave, col)
 
 		if(hardwareType == HARDWARE_ITC_DAC)
@@ -1190,13 +1188,17 @@ threadsafe static Function NWB_AppendSweepLowLevel(STRUCT NWBAsyncParameters &s)
 				params.channelSuffixDesc = NWB_SOURCE_TTL_BIT
 				params.stimset       = ttlStimsets[log(ttlBit)/log(2)]
 				NWB_GetTimeSeriesProperties(s.nwbVersion, s.numericalKeys, s.numericalValues, params, tsp)
-				params.groupIndex    = IsFinite(params.groupIndex) ? params.groupIndex : GetNextFreeGroupIndex(s.locationID, path)
+				params.groupIndex      = IsFinite(params.groupIndex) ? params.groupIndex : GetNextFreeGroupIndex(s.locationID, path)
+				WAVE/T/Z params.epochs = EP_FetchEpochs(s.numericalValues, s.textualValues, s.sweep, log(ttlBit)/log(2), params.channelType)
+
 				s.locationID = WriteSingleChannel(s.locationID, path, s.nwbVersion, params, tsp, compressionMode = s.compressionMode, nwbFilePath = s.nwbFilePath)
 			endfor
 		elseif(hardwareType == HARDWARE_NI_DAC)
-			WAVE params.data     = data
-			path                 = "/stimulus/presentation"
-			params.stimset       = stimset
+			WAVE params.data       = data
+			path                   = "/stimulus/presentation"
+			params.stimset         = stimset
+			WAVE/T/Z params.epochs = EP_FetchEpochs(s.numericalValues, s.textualValues, s.sweep, params.channelNumber, params.channelType)
+
 			NWB_GetTimeSeriesProperties(s.nwbVersion, s.numericalKeys, s.numericalValues, params, tsp)
 			params.groupIndex    = IsFinite(params.groupIndex) ? params.groupIndex : GetNextFreeGroupIndex(s.locationID, path)
 			s.locationID = WriteSingleChannel(s.locationID, path, s.nwbVersion, params, tsp, compressionMode = s.compressionMode, nwbFilePath = s.nwbFilePath)

Packages/tests/UTF_TestNWBExportV2.ipf

@@ -335,7 +335,7 @@ static Function TestTimeSeries(fileID, filepath, device, groupID, channel, sweep
 	DFREF pxpSweepsDFR
 	WAVE/Z epochs
 
-	variable channelGroupID, starting_time, session_start_time, actual, idx, index
+	variable channelGroupID, starting_time, session_start_time, actual, idx, index, channelNumber, ttlBit
 	variable clampMode, gain, gain_ref, resolution, conversion, headstage, rate_ref, rate, samplingInterval, samplingInterval_ref
 	string stimulus, stimulus_expected, channelName, str, path, neurodata_type
 	string electrode_name, electrode_name_ref, key, unit_ref, unit, base_unit_ref
@@ -536,8 +536,23 @@ static Function TestTimeSeries(fileID, filepath, device, groupID, channel, sweep
 		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)
+		channelNumber = params.channelNumber
+		ttlBit = NaN
+
+		if(params.channelType == XOP_CHANNEL_TYPE_TTL)
+			WAVE/Z channelMapHWToGUI = GetActiveChannels(numericalValues, textualValues, sweep, params.channelType, TTLMode = TTL_HWTOGUI_CHANNEL)
+			CHECK_WAVE(channelMapHWToGUI, NUMERIC_WAVE)
+
+			ttlBit = log(params.ttlBit)/log(2)
+			CHECK_GE_VAR(ttlBit, 0)
+
+			channelNumber = channelMapHWToGUI[params.channelNumber][ttlBit]
+			CHECK_GE_VAR(channelNumber, 0)
+		endif
+
+		WAVE/Z epochsLBN = EP_FetchEpochs(numericalValues, textualValues, sweep, channelNumber, params.channelType)
 		CHECK_WAVE(epochsLBN, TEXT_WAVE)
+		INFO("Channeltype: %s, GUI channel number %d, hardware channel number %d, TTL bit %d", s0 = StringFromList(params.channelType, CHANNEL_NAMES), n0 = channelNumber, n1 = params.channelNumber, n2 = ttlBit)
 		CHECK_EQUAL_TEXTWAVES(epochsLBN, epochsSingleChannel)
 	endif
 End