Merge pull request #2348 from AllenInstitute/bugfix/2348-non-existing…

…-sweep-data-in-tp SF_OperationTPIterate: Handle non-existing sweep data
AllenInstitute · Feb 12, 2025 · fdad71e · fdad71e
2 parents 2e1ca7a + e6b5497
commit fdad71e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Packages/MIES/MIES_SweepFormula.ipf b/Packages/MIES/MIES_SweepFormula.ipf
@@ -3219,8 +3219,8 @@ static Function/WAVE SF_OperationTPIterate(string graph, WAVE/WAVE mode, WAVE/Z/
 			continue
 		endif
 
-		WAVE/Z    selectData = selectDataComp[%SELECTION]
-		WAVE/WAVE sweepData  = SF_OperationTPImpl(graph, mode, selectData, ignoreTPs, opShort)
+		WAVE/Z      selectData = selectDataComp[%SELECTION]
+		WAVE/Z/WAVE sweepData  = SF_OperationTPImpl(graph, mode, selectData, ignoreTPs, opShort)
 		if(!WaveExists(sweepData))
 			continue
 		endif

diff --git a/Packages/tests/Basic/UTF_SweepFormula_Operations.ipf b/Packages/tests/Basic/UTF_SweepFormula_Operations.ipf
@@ -328,6 +328,18 @@ static Function CheckTPFitResult(WAVE/WAVE wv, string fit, string result, variab
 	CHECK_EQUAL_VAR(trailLength, maxlength)
 End
 
+static Function TestOperationTP()
+
+	string win, formula
+
+	win = GetDataBrowserWithData()
+
+	formula = "tp(tpfit(exp, amp), select(selvis(all), selsweeps(1000)))"
+	WAVE/Z/WAVE output = SF_ExecuteFormula(formula, win, useVariables = 0)
+	CHECK_WAVE(output, WAVE_WAVE)
+	CHECK_EQUAL_VAR(DimSize(output, ROWS), 0)
+End
+
 static Function TestOperationTPfit()
 
 	string formula, strRef, dataType, dataTypeRef