Merge pull request #945 in ENG/mies-igor from ~THOMASB/mies-igor:feature/support-for-ITC16 to master

* commit '944fe03511f45f70aff3c013d6baa9f2a2066b04':
  SI_GetMinSampIntWave: Support ITC16/ITC16USB
  Add SamplingInterval table for ITC16/ITC16USB
  SI_CreateLookupWave: Store the created lookup wave on disc automatically
  SI_TestSampInt: Return -1 on failure
  SI_CreateLookupWave: Make it work again
  SI_CreateLookupWave: Add setup for ITC16/ITC16USB
  SI_CreateLookupWave: Initialize raCycleID
  SI_CompressWave: Avoid using the backup wave
  NUM_CONSEC_FIFO_STILLSTANDS: Remove unused constant

Original-CommitID: 0642453dcabb62e12b9f12977acaa9f32d68eebc

Author: timjarsky

Diff for: Packages/MIES/MIES_Constants.ipf

@@ -592,10 +592,6 @@ StrConstant ANALYSISBROWSER_FILE_TYPE_IGOR = "I"
 StrConstant ANALYSISBROWSER_FILE_TYPE_NWB  = "N"
 /// @}
 
-/// Device restart happens after this number of sweeps with stuck FIFO, used by
-/// TP MD
-Constant NUM_CONSEC_FIFO_STILLSTANDS = 3
-
 /// Convenience definition for functions interacting with threads
 Constant MAIN_THREAD = 0
 

Diff for: Packages/MIES/MIES_SamplingInterval.ipf

@@ -125,8 +125,7 @@ static Function SI_CompressWave(wv)
 
 	variable i, j
 
-	ReplaceWaveWithBackup(wv, nonExistingBackupIsFatal=0)
-	CreateBackupWave(wv)
+	CreateBackupWave(wv, forceCreation = 1)
 	SI_SortWave(wv)
 
 	for(i = 0; i < DimSize(wv, ROWS); i += 1)
@@ -224,6 +223,18 @@ static Function/WAVE SI_LoadMinSampIntFromDisk(deviceType)
 	return wv
 End
 
+/// @brief Store the lookup wave on disc
+Function/WAVE SI_StoreMinSampIntOnDisk(wv, deviceType)
+	WAVE wv
+	string deviceType
+
+	Duplicate wv, $("SampInt_" + deviceType)/WAVE=storedWave
+
+	string path = GetFolder(FunctionPath("")) + "SampInt_" + deviceType + ".itx"
+	Save/O/T/M="\n" storedWave as path
+	KillWaves/Z storedWave
+End
+
 /// @brief Query the DA_EPhys panel for the active channels and
 /// fill it in the passed structure
 ///
@@ -276,6 +287,9 @@ Function SI_CreateLookupWave(panelTitle, [ignoreChannelOrder])
 		ignoreChannelOrder = !!ignoreChannelOrder
 	endif
 
+	NVAR raCycleID = $GetRepeatedAcquisitionCycleID(panelTitle)
+	raCycleID = 1
+
 	DC_ConfigureDataForITC(panelTitle, DATA_ACQUISITION_MODE)
 
 	WAVE ITCDataWave = GetITCDataWave(panelTitle)
@@ -286,7 +300,7 @@ Function SI_CreateLookupWave(panelTitle, [ignoreChannelOrder])
 	ret = ParseDeviceString(panelTitle, deviceType, deviceNumber)
 	ASSERT(ret, "Could not parse panelTitle")
 
-	if(!cmpstr(deviceType, "ITC18USB"))
+	if(!cmpstr(deviceType, "ITC18USB") || !cmpstr(deviceType, "ITC16USB") || !cmpstr(deviceType, "ITC16"))
 		totalNumDA    = 4
 		totalNumAD    = 8
 		totalNumTTL   = 4
@@ -415,23 +429,21 @@ Function SI_CreateLookupWave(panelTitle, [ignoreChannelOrder])
 	ITCConfigChannelReset2
 
 	SI_CompressWave(results)
+	SI_StoreMinSampIntOnDisk(results, deviceType)
 End
 
 /// @brief Test the preset sampling interval
 static Function SI_TestSampInt(panelTitle)
 	string panelTitle
 
-	variable i, sampInt, ret, sampIntRead, numChannels, sampIntRef, iLast
+	variable i, sampInt, sampIntRead, numChannels, sampIntRef, iLast
 	variable numConsecutive = -1
 	variable numTries = 1001
 
 	WAVE ITCDataWave = GetITCDataWave(panelTitle)
 	WAVE ITCChanConfigWave = GetITCChanConfigWave(panelTitle)
 	numChannels = DimSize(ITCChanConfigWave, ROWS)
 
-	Make/I/FREE/N=(2, numChannels) ReqWave
-	ReqWave[0][] = ITCChanConfigWave[q][0]
-	ReqWave[1][] = ITCChanConfigWave[q][1]
 	Make/D/FREE/N=(20, numChannels) ResultWave
 
 	for(i=1; i < numTries; i += 1)
@@ -442,15 +454,17 @@ static Function SI_TestSampInt(panelTitle)
 		endif
 
 		ITCChanConfigWave[][2] = sampInt
-		ITCConfigAllChannels2/Z ITCChanConfigWave, ITCDataWave
 
-		if(!ret)
+		WAVE config_t = HW_ITC_TransposeAndToDouble(ITCChanConfigWave)
+		ITCConfigAllChannels2/Z config_t, ITCDataWave
+
+		if(!V_ITCError)
 			// we could set the sampling interval
 			// so we try to read it back and check if it is the same
 			ITCConfigChannelUpload2
 			HW_ITC_HandleReturnValues(HARDWARE_ABORT_ON_ERROR, V_ITCError, V_ITCXOPError)
 
-			ITCGetAllChannelsConfig2/O ReqWave, ResultWave
+			ITCGetAllChannelsConfig2/O config_t, ResultWave
 			HW_ITC_HandleReturnValues(HARDWARE_ABORT_ON_ERROR, V_ITCError, V_ITCXOPError)
 
 			WaveStats/Q/R=[12,12] ResultWave
@@ -477,7 +491,7 @@ static Function SI_TestSampInt(panelTitle)
 		endif
 	endfor
 
-	return NaN
+	return -1
 End
 
 #else
@@ -557,6 +571,16 @@ static Function/WAVE SI_GetMinSampIntWave(panelTitle)
 				return SI_LoadMinSampIntFromDisk("ITC18USB")
 			endif
 
+			return wv
+			break
+		case "ITC16USB":
+		case "ITC16":
+			WAVE/SDFR=dfr/Z wv = SampInt_ITC16USB
+
+			if(!WaveExists(wv))
+				return SI_LoadMinSampIntFromDisk("ITC16USB")
+			endif
+
 			return wv
 			break
 		case "ITC1600":

Diff for: Packages/MIES/SampInt_ITC16USB.itx

@@ -0,0 +1,91 @@
+IGOR
+WAVES/B/N=(79,7)	SampInt_ITC16USB
+BEGIN
+	0	0	1	0	0	0	5
+	0	0	2	0	0	0	10
+	0	1	1	0	0	0	5
+	0	1	1	0	0	0	10
+	0	1	2	0	0	0	10
+	0	2	1	0	0	0	10
+	0	2	2	0	0	0	10
+	0	3	1	0	0	0	20
+	0	3	2	0	0	0	20
+	0	4	1	0	0	0	20
+	0	4	2	0	0	0	20
+	0	5	1	0	0	0	25
+	0	5	2	0	0	0	25
+	1	0	0	0	0	0	5
+	1	0	1	0	0	0	10
+	1	0	2	0	0	0	20
+	1	1	0	0	0	0	5
+	1	1	1	0	0	0	10
+	1	1	2	0	0	0	20
+	1	2	0	0	0	0	10
+	1	2	1	0	0	0	10
+	1	2	2	0	0	0	20
+	1	3	0	0	0	0	20
+	1	3	1	0	0	0	20
+	1	3	2	0	0	0	20
+	1	4	0	0	0	0	20
+	1	4	1	0	0	0	20
+	1	4	2	0	0	0	20
+	1	5	0	0	0	0	25
+	1	5	1	0	0	0	25
+	1	5	2	0	0	0	25
+	2	0	0	0	0	0	10
+	2	0	1	0	0	0	20
+	2	0	2	0	0	0	20
+	2	1	0	0	0	0	10
+	2	1	1	0	0	0	20
+	2	1	2	0	0	0	20
+	2	2	0	0	0	0	10
+	2	2	1	0	0	0	20
+	2	2	2	0	0	0	20
+	2	3	0	0	0	0	20
+	2	3	1	0	0	0	20
+	2	3	2	0	0	0	20
+	2	4	0	0	0	0	20
+	2	4	1	0	0	0	20
+	2	4	2	0	0	0	20
+	2	5	0	0	0	0	25
+	2	5	1	0	0	0	25
+	2	5	2	0	0	0	25
+	3	0	0	0	0	0	20
+	3	0	1	0	0	0	20
+	3	0	2	0	0	0	25
+	3	1	0	0	0	0	20
+	3	1	1	0	0	0	20
+	3	1	2	0	0	0	25
+	3	2	0	0	0	0	20
+	3	2	1	0	0	0	20
+	3	2	2	0	0	0	25
+	3	3	0	0	0	0	20
+	3	3	1	0	0	0	20
+	3	3	2	0	0	0	25
+	3	4	0	0	0	0	20
+	3	4	1	0	0	0	20
+	3	4	2	0	0	0	25
+	3	5	0	0	0	0	25
+	3	5	1	0	0	0	25
+	3	5	2	0	0	0	25
+	4	0	0	0	0	0	20
+	4	0	1	0	0	0	25
+	4	1	0	0	0	0	20
+	4	1	1	0	0	0	25
+	4	2	0	0	0	0	20
+	4	2	1	0	0	0	25
+	4	3	0	0	0	0	20
+	4	3	1	0	0	0	25
+	4	4	0	0	0	0	20
+	4	4	1	0	0	0	25
+	4	5	0	0	0	0	25
+	4	5	1	0	0	0	25
+END
+X SetScale/P x 0,1,"", SampInt_ITC16USB; SetScale/P y 0,1,"", SampInt_ITC16USB; SetScale d 0,0,"", SampInt_ITC16USB
+X SetDimLabel 1, 0, numDARack1, SampInt_ITC16USB
+X SetDimLabel 1, 1, numADRack1, SampInt_ITC16USB
+X SetDimLabel 1, 2, numTTLRack1, SampInt_ITC16USB
+X SetDimLabel 1, 3, numDARack2, SampInt_ITC16USB
+X SetDimLabel 1, 4, numADRack2, SampInt_ITC16USB
+X SetDimLabel 1, 5, numTTLRack2, SampInt_ITC16USB
+X SetDimLabel 1, 6, minSampInt, SampInt_ITC16USB