SCOPE: Use precise timestamp per TP for tpInput data

In our TP data we used until now only simply DateTime of the moment the
data was sent into analysis for the timestamp. This resulted in multiple
TPs (all from the same new FIFO data) having nearly the same timestamp.

Now the timestamp of each TP based on the acquisition start and TP
position in the acquisition is determined.

Note regarding the calculation:
(tpCounter + i) * tpInput.samplingIntervalDAC * tpInput.tpLengthPointsDAC * MILLI_TO_ONE

tpCounter originates from NI devices in TP acquisition mode.
There the acquisition with a single TP repeats itself in hardware.
The TPs are counted based on the FIFO data and each TP is sent to
SCOPE_UpdateOscilloscopeData separately. Thus, i is always zero and
tpCounter the number of the TP since acquisition start.

For all other hardware devices and acquisition modes tpCounter is zero and
i counts the absolute TP number based on the position of the data in the FIFO.

Author: MichaelHuth

Packages/MIES/MIES_Oscilloscope.ipf

@@ -466,7 +466,7 @@ Function SCOPE_UpdateOscilloscopeData(string device, variable dataAcqOrTP, [vari
 	STRUCT TPAnalysisInput tpInput
 	variable i, j
 	variable tpChannels, numADCs, numDACs, tpLengthPointsADC, tpStart, tpEnd, tpStartPos
-	variable TPChanIndex, saveTP, clampAmp
+	variable TPChanIndex, saveTP, clampAmp, timeSinceAcqStart, timeOfAcqStartUTC, tpCounter
 	variable headstage, fifoLatest, channelIndex
 	string hsList
 
@@ -478,6 +478,7 @@ Function SCOPE_UpdateOscilloscopeData(string device, variable dataAcqOrTP, [vari
 					chunk = 0
 				endif
 				ASSERT(ParamIsDefault(fifoPos), "optional parameter fifoPos is not possible with TEST_PULSE_MODE")
+				tpCounter = chunk
 			elseif(dataAcqOrTP == DATA_ACQUISITION_MODE)
 				ASSERT(!ParamIsDefault(fifoPos), "optional parameter fifoPos missing")
 				ASSERT(ParamIsDefault(chunk), "optional parameter chunk is not possible with DATA_ACQUISITION_MODE")
@@ -489,11 +490,15 @@ Function SCOPE_UpdateOscilloscopeData(string device, variable dataAcqOrTP, [vari
 		case HARDWARE_NI_DAC:
 			ASSERT(!ParamIsDefault(deviceID), "optional parameter deviceID missing (required for NI devices in TP mode)")
 			SCOPE_NI_UpdateOscilloscope(device, dataAcqOrTP, deviceID, fifoPos)
+			if(dataAcqOrTP == TEST_PULSE_MODE)
+				tpCounter = ROVar(GetNITestPulseCounter(device))
+			endif
 			break
 		case HARDWARE_SUTTER_DAC:
 			if(dataAcqOrTP == TEST_PULSE_MODE)
 				ASSERT(!ParamIsDefault(chunk), "optional parameter chunk is missing with TEST_PULSE_MODE")
 				ASSERT(ParamIsDefault(fifoPos), "optional parameter fifoPos is not possible with TEST_PULSE_MODE")
+				tpCounter = chunk
 			elseif(dataAcqOrTP == DATA_ACQUISITION_MODE)
 				ASSERT(!ParamIsDefault(fifoPos), "optional parameter fifoPos missing")
 				ASSERT(ParamIsDefault(chunk), "optional parameter chunk is not possible with DATA_ACQUISITION_MODE")
@@ -529,6 +534,8 @@ Function SCOPE_UpdateOscilloscopeData(string device, variable dataAcqOrTP, [vari
 		numDACs = DimSize(DACs, ROWS)
 		numADCs = DimSize(ADCs, ROWS)
 
+		timeOfAcqStartUTC = ParseISO8601TimeStamp(ROStr(GetLastAcquisitionStartTime(device)))
+
 		// note: currently this works for multiplier = 1 only, see DC_PlaceDataInDAQDataWave
 		Make/FREE/N=(tpLengthPointsADC) channelData
 		WAVE tpInput.data = channelData
@@ -577,8 +584,9 @@ Function SCOPE_UpdateOscilloscopeData(string device, variable dataAcqOrTP, [vari
 			endif
 
 			// Use same time for all headstages
-			tpInput.timeStamp     = DateTime
-			tpInput.timeStampUTC  = DateTimeInUTC()
+			timeSinceAcqStart     = (tpCounter + i) * tpInput.samplingIntervalDAC * tpInput.tpLengthPointsDAC * MILLI_TO_ONE
+			tpInput.timeStampUTC  = timeOfAcqStartUTC + timeSinceAcqStart
+			tpInput.timeStamp     = UTCTimeToLocal(tpInput.timeStampUTC)
 			tpInput.sendTPMessage = 1
 
 			for(j = 0; j < numADCs; j += 1)