Fix: LeftOverSweepTime - treat fifopos of NaN as finished sweep

Previously a fifopos of NaN triggered an ASSERTion. However if the sweep already
finished when LeftOverSweepTime was called, then the fifopos was NaN.

Fix: Correctly return 0 for this case.

Author: MichaelHuth

Packages/MIES/MIES_MiesUtilities_Sweep.ipf

@@ -440,7 +440,10 @@ End
 
 Function LeftOverSweepTime(string device, variable fifoPos)
 
-	ASSERT(IsFinite(fifoPos), "Unexpected non-finite fifoPos")
+	if(IsNaN(fifopos))
+		// TFH_FifoLoop thread finished -> sweep finished regular (or manually stopped)
+		return 0
+	endif
 
 	WAVE DAQDataWave         = GetDAQDataWave(device, DATA_ACQUISITION_MODE)
 	NVAR stopCollectionPoint = $GetStopCollectionPoint(device)

Packages/tests/HardwareBasic/UTF_AnalysisFunctionManagement.ipf

@@ -48,6 +48,7 @@ static Function ChangeAnalysisFunctions_IGNORE()
 	ST_SetStimsetParameter("AnaFuncInvalid2_DA_0", "Analysis post DAQ function", str = "InvalidSignatureAndReturnType")
 
 	ST_SetStimsetParameter("AnaFuncStopMid_DA_0", "Analysis mid sweep function", str = "StopMidSweep")
+	ST_SetStimsetParameter("AnaFuncWaitMid_DA_0", "Analysis mid sweep function", str = "WaitMidSweep")
 
 	ST_SetStimsetParameter("AnaFuncValidMult_DA_0", "Analysis pre DAQ function", str = "ValidMultHS_V1")
 	ST_SetStimsetParameter("AnaFuncValidMult_DA_0", "Analysis pre set function", str = "ValidMultHS_V1")
@@ -1051,6 +1052,27 @@ End
 
 static Function AFT13_REENTRY([string str])
 
+	AFT13x_Checks(str, "StopMidSweep")
+End
+
+// Delay acquisition background task call until sweep already finished and ITC fifopos returned == NaN
+// UTF_TD_GENERATOR DeviceNameGeneratorMD1
+static Function AFT13a([string str])
+
+	STRUCT DAQSettings s
+	InitDAQSettingsFromString(s, "MD1_RA0_I0_L0_BKG1"                           + \
+	                             "__HS0_DA0_AD0_CM:IC:_ST:AnaFuncWaitMid_DA_0:" + \
+	                             "__HS1_DA1_AD1_CM:IC:_ST:AnaFuncWaitMid_DA_0:")
+	AcquireData_NG(s, str)
+End
+
+static Function AFT13a_REENTRY([string str])
+
+	AFT13x_Checks(str, "WaitMidSweep")
+End
+
+static Function AFT13x_Checks(string str, string funcName)
+
 	variable sweepNo
 	string   key
 
@@ -1087,7 +1109,7 @@ static Function AFT13_REENTRY([string str])
 	key = StringFromList(MID_SWEEP_EVENT, EVENT_NAME_LIST_LBN)
 	WAVE/Z/T anaFuncs = GetLastSetting(textualValues, sweepNo, key, DATA_ACQUISITION_MODE)
 	CHECK_WAVE(anaFuncs, TEXT_WAVE)
-	CHECK_EQUAL_TEXTWAVES(anaFuncs, {"StopMidSweep", "StopMidSweep", "", "", "", "", "", "", ""})
+	CHECK_EQUAL_TEXTWAVES(anaFuncs, {funcName, funcName, "", "", "", "", "", "", ""})
 
 	key = StringFromList(POST_SWEEP_EVENT, EVENT_NAME_LIST_LBN)
 	WAVE/Z/T anaFuncs = GetLastSetting(textualValues, sweepNo, key, DATA_ACQUISITION_MODE)

Packages/tests/UserAnalysisFunctions.ipf

@@ -891,6 +891,19 @@ Function StopMidSweep_V3(string device, STRUCT AnalysisFunction_V3 &s)
 	return 0
 End
 
+Function WaitMidSweep(string device, variable eventType, WAVE DAQDataWave, variable headStage, variable realDataLength)
+
+	WAVE anaFuncTracker = TrackAnalysisFunctionCalls()
+
+	CHECK_GE_VAR(eventType, 0)
+	CHECK_LT_VAR(eventType, DimSize(anaFuncTracker, ROWS))
+	anaFuncTracker[eventType][headstage] += 1
+
+	Sleep/S 5
+
+	return ANALYSIS_FUNC_RET_REPURP_TIME
+End
+
 Function AddTooLargeUserEpoch_V3(string device, STRUCT AnalysisFunction_V3 &s)
 
 	variable DAC