PSX_OperationKernel: Support multiple select statements

This removes the artificial restriction introduced in 83713dd (SF
Implement new select operation, 2024-10-02).

We now also check that ranges from the same
sweep/channel/channelType/experiment combination don't intersect.

Author: t-b

Packages/MIES/MIES_SweepFormula_PSX.ipf

@@ -4727,23 +4727,15 @@ Function/WAVE PSX_OperationKernel(variable jsonId, string jsonPath, string graph
 	variable riseTau, decayTau, amp, dt, numPoints, numCombos, i, offset, idx
 	string parameterPath, key
 
-	WAVE/WAVE selectDataCompArray = SFH_GetArgumentSelect(jsonID, jsonPath, graph, SF_OP_PSX_KERNEL, 0)
+	WAVE/Z/WAVE selectDataCompArray = SFH_GetArgumentSelect(jsonID, jsonPath, graph, SF_OP_PSX_KERNEL, 0)
+	SFH_ASSERT(WaveExists(selectDataCompArray), "Could not gather sweep data from select statement")
 
 	riseTau  = SFH_GetArgumentAsNumeric(jsonID, jsonPath, graph, SF_OP_PSX_KERNEL, 1, defValue = 1, checkFunc = IsStrictlyPositiveAndFinite)
 	decayTau = SFH_GetArgumentAsNumeric(jsonID, jsonPath, graph, SF_OP_PSX_KERNEL, 2, defValue = 15, checkFunc = IsStrictlyPositiveAndFinite)
 	amp      = SFH_GetArgumentAsNumeric(jsonID, jsonPath, graph, SF_OP_PSX_KERNEL, 3, defValue = -5, checkFunc = IsFinite)
 
 	SFH_ASSERT(decayTau > riseTau, "decay tau must be strictly larger than the rise tau")
 
-	SFH_ASSERT(DimSize(selectDataCompArray, ROWS) == 1, "Only supports a single selection at the moment")
-
-	WAVE/WAVE selectDataComp = selectDataCompArray[0]
-
-	WAVE/Z    selectData = selectDataComp[%SELECTION]
-	WAVE/WAVE range      = selectDataComp[%RANGE]
-
-	SFH_ASSERT(WaveExists(selectData), "Could not gather sweep data from select statement")
-
 	WAVE/WAVE sweepDataRef = SFH_GetSweepsForFormula(graph, selectDataCompArray, SF_OP_PSX_KERNEL)
 
 	numCombos = DimSize(sweepDataRef, ROWS)
@@ -4754,8 +4746,21 @@ Function/WAVE PSX_OperationKernel(variable jsonId, string jsonPath, string graph
 	Make/FREE/T rawLabels = {"psxKernel", "psxKernelFFT", "sweepData"}
 	ASSERT(DimSize(rawLabels, ROWS) == PSX_KERNEL_OUTPUTWAVES_PER_ENTRY, "Mismatched rawLabels wave")
 
+	Make/FREE/N=(0) allResolvedRanges
+	Make/FREE/N=(0)/T allSelectHashes
+
 	for(i = 0; i < numCombos; i += 1)
-		WAVE sweepData = sweepDataRef[i]
+		WAVE/Z sweepData = sweepDataRef[i]
+		ASSERT(WaveExists(sweepData), "Can't handle invalid sweepData waves")
+
+		[WAVE singleSelectData, WAVE range] = SFH_ParseToSelectDataWaveAndRange(sweepData)
+
+		[WAVE resolvedRanges, WAVE/T epochRangeNames] = SFH_GetNumericRangeFromEpochFromSingleSelect(graph, singleSelectData, range)
+
+		if(!WaveExists(resolvedRanges))
+			continue
+		endif
+
 		numPoints = DimSize(sweepData, ROWS)
 		dt        = DimDelta(sweepData, ROWS)
 
@@ -4770,6 +4775,8 @@ Function/WAVE PSX_OperationKernel(variable jsonId, string jsonPath, string graph
 			continue
 		endif
 
+		PSX_CollectResolvedRanges(graph, resolvedRanges, singleSelectData, allResolvedRanges, allSelectHashes)
+
 		Duplicate/FREE/T rawLabels, labels
 		labels[] = PSX_GenerateKey(rawLabels[p], idx)
 		SetDimensionLabels(output, TextWaveToList(labels, ";"), ROWS, startPos = idx * PSX_KERNEL_OUTPUTWAVES_PER_ENTRY)
@@ -4788,14 +4795,13 @@ Function/WAVE PSX_OperationKernel(variable jsonId, string jsonPath, string graph
 
 	SFH_ASSERT(numCombos > 0, "Could not create psxKernel")
 
+	PSX_CheckResolvedRangesWithSelectHashes(allResolvedRanges, allSelectHashes)
+
 	Redimension/N=(PSX_KERNEL_OUTPUTWAVES_PER_ENTRY * numCombos) output
 
 	parameterPath = SF_META_USER_GROUP + PSX_JWN_PARAMETERS + "/" + SF_OP_PSX_KERNEL
 
-	WAVE rangeClean = ZapNullRefs(range)
-
 	JWN_CreatePath(output, parameterPath)
-	JWN_SetWaveInWaveNote(output, parameterPath + "/range", rangeClean) // not the same as SF_META_RANGE
 	JWN_SetNumberInWaveNote(output, parameterPath + "/riseTau", riseTau)
 	JWN_SetNumberInWaveNote(output, parameterPath + "/decayTau", decayTau)
 	JWN_SetNumberInWaveNote(output, parameterPath + "/amp", amp)

Packages/tests/Basic/UTF_SweepFormula_PSX.ipf

@@ -1316,7 +1316,7 @@ static Function TestOperationPSXKernel()
 	CHECK_GE_VAR(jsonID, 0)
 	WAVE/Z params = JSON_GetKeys(jsonID, SF_META_USER_GROUP + "Parameters/" + SF_OP_PSX_KERNEL)
 	CHECK_WAVE(params, TEXT_WAVE)
-	CHECK_EQUAL_VAR(DimSize(params, ROWS), 4)
+	CHECK_EQUAL_VAR(DimSize(params, ROWS), 3)
 	JSON_Release(jsonID)
 
 	// offset for sweep data is 50 due to the range above
@@ -1327,6 +1327,15 @@ static Function TestOperationPSXKernel()
 	CheckDimensionScaleHelper(dataWref[4], 0, 0.01)
 	CheckDimensionScaleHelper(dataWref[5], 50, 0.2)
 
+	str = "psxKernel([select(selRange([50, 150]), selchannels(AD6), selsweeps(0), selvis(all)), select(selRange([50, 150]), selchannels(AD6), selsweeps(2), selvis(all))], 1, 15, -5)"
+	WAVE/WAVE dataWref = SF_ExecuteFormula(str, win, useVariables = 0)
+	CHECK_WAVE(dataWref, WAVE_WAVE)
+	CHECK_EQUAL_VAR(DimSize(dataWref, ROWS), 6)
+
+	actual = MIES_CA#CA_WaveCRCs(dataWref, includeWaveScalingAndUnits = 1)
+	// same hashes as above with only a single select
+	CHECK_EQUAL_STR(expected, actual)
+
 	// three waves from first range, none from second
 	Make/FREE/T/N=(3, 1, 1) epochKeys
 	epochKeys[0][0][0] = EPOCHS_ENTRY_KEY
@@ -1339,6 +1348,11 @@ static Function TestOperationPSXKernel()
 	epochsWave[0][EPOCH_COL_TAGS][DAC][XOP_CHANNEL_TYPE_DAC]      = "ShortName=E0;stuff"
 	epochsWave[0][EPOCH_COL_TREELEVEL][DAC][XOP_CHANNEL_TYPE_DAC] = "0"
 
+	epochsWave[1][EPOCH_COL_STARTTIME][DAC][XOP_CHANNEL_TYPE_DAC] = "0.075"
+	epochsWave[1][EPOCH_COL_ENDTIME][DAC][XOP_CHANNEL_TYPE_DAC]   = "0.175"
+	epochsWave[1][EPOCH_COL_TAGS][DAC][XOP_CHANNEL_TYPE_DAC]      = "ShortName=E1;apples"
+	epochsWave[1][EPOCH_COL_TREELEVEL][DAC][XOP_CHANNEL_TYPE_DAC] = "1"
+
 	Make/FREE/T/N=(1, 1, LABNOTEBOOK_LAYER_COUNT) epochInfo = EP_EpochWaveToStr(epochsWave, DAC, XOP_CHANNEL_TYPE_DAC)
 	ED_AddEntriesToLabnotebook(epochInfo, epochKeys, 0, device, DATA_ACQUISITION_MODE)
 
@@ -1376,6 +1390,15 @@ static Function TestOperationPSXKernel()
 	catch
 		PASS()
 	endtry
+
+	// overlapping intervals in one select statement
+	str = "psxKernel(select(selrange([E0, E1]), selchannels(AD6), selsweeps([0]), selvis(all)), 1, 15, -5)"
+	try
+		WAVE/WAVE dataWref = SF_ExecuteFormula(str, win, useVariables = 0)
+		FAIL()
+	catch
+		PASS()
+	endtry
 End
 
 static Function CheckDimensionScaleHelper(WAVE wv, variable refOffset, variable refPerPoint)
@@ -1456,7 +1479,7 @@ static Function TestOperationPSX([STRUCT IUTF_mData &m])
 	CHECK_GE_VAR(jsonID, 0)
 	WAVE/Z params = JSON_GetKeys(jsonID, SF_META_USER_GROUP + "Parameters/" + SF_OP_PSX_KERNEL)
 	CHECK_WAVE(params, TEXT_WAVE)
-	CHECK_EQUAL_VAR(DimSize(params, ROWS), 4)
+	CHECK_EQUAL_VAR(DimSize(params, ROWS), 3)
 
 	WAVE/Z params = JSON_GetKeys(jsonID, SF_META_USER_GROUP + "Parameters/" + SF_OP_PSX)
 	CHECK_WAVE(params, TEXT_WAVE)