DC_GenerateStimsetFingerprint: Move from StringCRC to HashString

And add a textual helper wave for data acquisition to store the hash.

Author: t-b

Packages/MIES/MIES_DAEphys.ipf

@@ -1220,8 +1220,11 @@ Function DAP_OneTimeCallBeforeDAQ(string device, variable runMode)
 	NVAR fifoPosition = $GetFifoPosition(device)
 	fifoPosition = NaN
 
-	WAVE stimsetAcqIDHelper = GetStimsetAcqIDHelperWave(device)
-	stimsetAcqIDHelper = NaN
+	WAVE stimsetAcqIDNumericalHelper = GetStimsetAcqIDNumericalHelperWave(device)
+	stimsetAcqIDNumericalHelper = NaN
+
+	WAVE/T stimsetAcqIDTextualHelper = GetStimsetAcqIDTextualHelperWave(device)
+	stimsetAcqIDTextualHelper = ""
 
 	DAP_ClearDelayedClampModeChange(device)
 

Packages/MIES/MIES_DataConfigurator.ipf

@@ -1105,8 +1105,8 @@ End
 
 static Function DC_PrepareLBNEntries(string device, STRUCT DataConfigurationResult &s)
 
-	variable i, j, maxITI, channel, headstage, fingerprint, stimsetCycleID, isoodDAQMember, samplingInterval
-	string func, ctrl, str, setChecksum
+	variable i, j, maxITI, channel, headstage, stimsetCycleID, isoodDAQMember, samplingInterval
+	string func, ctrl, str, fingerprint, setChecksum
 
 	WAVE config = GetDAQConfigWave(device)
 
@@ -1865,20 +1865,21 @@ End
 /// @param device  device
 /// @param fingerprint fingerprint as returned by DC_GenerateStimsetFingerprint()
 /// @param DAC         DA channel
-static Function DC_GetStimsetAcqCycleID(string device, variable fingerprint, variable DAC)
+static Function DC_GetStimsetAcqCycleID(string device, string fingerprint, variable DAC)
 
-	WAVE stimsetAcqIDHelper = GetStimsetAcqIDHelperWave(device)
+	WAVE   stimsetAcqIDNumericalHelper = GetStimsetAcqIDNumericalHelperWave(device)
+	WAVE/T stimsetAcqIDTextualHelper   = GetStimsetAcqIDTextualHelperWave(device)
 
-	ASSERT(IsFinite(fingerprint), "Invalid fingerprint")
+	ASSERT(IsEmpty(fingerprint), "Invalid fingerprint")
 
-	if(fingerprint == stimsetAcqIDHelper[DAC][%fingerprint])
-		return stimsetAcqIDHelper[DAC][%id]
+	if(!cmpstr(fingerprint, stimsetAcqIDTextualHelper[DAC][%fingerprint]))
+		return stimsetAcqIDNumericalHelper[DAC][%id]
 	endif
 
-	stimsetAcqIDHelper[DAC][%fingerprint] = fingerprint
-	stimsetAcqIDHelper[DAC][%id]          = GetNextRandomNumberForDevice(device)
+	stimsetAcqIDTextualHelper[DAC][%fingerprint] = fingerprint
+	stimsetAcqIDNumericalHelper[DAC][%id]        = GetNextRandomNumberForDevice(device)
 
-	return stimsetAcqIDHelper[DAC][%id]
+	return stimsetAcqIDNumericalHelper[DAC][%id]
 End
 
 /// @brief Generate the stimset fingerprint
@@ -1891,21 +1892,21 @@ End
 ///
 /// Always then this fingerprint changes, a new stimset acquisition cycle ID has
 /// to be generated.
-static Function DC_GenerateStimsetFingerprint(variable raCycleID, string setName, variable setCycleCount, string setChecksum)
+static Function/S DC_GenerateStimsetFingerprint(variable raCycleID, string setName, variable setCycleCount, string setChecksum)
 
-	variable crc
+	string hv = ""
 
 	ASSERT(IsInteger(raCycleID) && raCycleID > 0, "Invalid raCycleID")
 	ASSERT(IsInteger(setCycleCount), "Invalid setCycleCount")
 	ASSERT(!IsEmpty(setChecksum), "Invalid stimset checksum")
 	ASSERT(!IsEmpty(setName) && !cmpstr(setName, trimstring(setName)), "Invalid setName")
 
-	crc = StringCRC(crc, num2str(raCycleID))
-	crc = StringCRC(crc, num2str(setCycleCount))
-	crc = StringCRC(crc, setChecksum)
-	crc = StringCRC(crc, setName)
+	hv = HashNumber(hv, raCycleID)
+	hv = HashNumber(hv, setCycleCount)
+	hv = HashString(hv, setChecksum)
+	hv = HashString(hv, setName)
 
-	return crc
+	return hv
 End
 
 static Function [variable result, variable row, variable column] DC_CheckIfDataWaveHasBorderVals(string device, variable dataAcqOrTP)

Packages/MIES/MIES_WaveDataFolderGetters.ipf

@@ -1251,7 +1251,33 @@ Function/WAVE GetTTLWave(string device)
 	endswitch
 End
 
-/// @brief Return the stimset acquistion cycle ID helper wave
+/// @brief Return the stimset acquisition cycle ID helper wave (numerical)
+///
+/// Only valid during DAQ.
+///
+/// Rows:
+/// - NUM_DA_TTL_CHANNELS
+///
+/// Columns:
+/// - 0: Current stimset acquisition cycle ID
+Function/WAVE GetStimsetAcqIDNumericalHelperWave(string device)
+
+	DFREF dfr = GetDevicePath(device)
+
+	WAVE/Z/D/SDFR=dfr wv = stimsetAcqIDNumericalHelper
+
+	if(WaveExists(wv))
+		return wv
+	endif
+
+	Make/D/N=(NUM_DA_TTL_CHANNELS, 1) dfr:stimsetAcqIDNumericalHelper/WAVE=wv
+
+	SetDimLabel COLS, 0, id, wv
+
+	return wv
+End
+
+/// @brief Return the stimset acquisition cycle ID helper wave (textual)
 ///
 /// Only valid during DAQ.
 ///
@@ -1260,21 +1286,19 @@ End
 ///
 /// Columns:
 /// - 0: Stimset fingerprint of the previous sweep
-/// - 1: Current stimset acquisition cycle ID
-Function/WAVE GetStimsetAcqIDHelperWave(string device)
+Function/WAVE GetStimsetAcqIDTextualHelperWave(string device)
 
 	DFREF dfr = GetDevicePath(device)
 
-	WAVE/Z/D/SDFR=dfr wv = stimsetAcqIDHelper
+	WAVE/Z/T/SDFR=dfr wv = stimsetAcqIDHelper
 
 	if(WaveExists(wv))
 		return wv
 	endif
 
-	Make/D/N=(NUM_DA_TTL_CHANNELS, 2) dfr:stimsetAcqIDHelper/WAVE=wv
+	Make/T/N=(NUM_DA_TTL_CHANNELS, 1) dfr:stimsetAcqIDTextualHelper/WAVE=wv
 
 	SetDimLabel COLS, 0, fingerprint, wv
-	SetDimLabel COLS, 1, id, wv
 
 	return wv
 End