changes

AllenInstitute · Nov 20, 2022 · 813b0ad · 813b0ad
1 parent 8827d7e
commit 813b0ad
Show file tree

Hide file tree

Showing 4 changed files with 290 additions and 27 deletions.
diff --git a/Packages/MIES/DC_proc.ipf b/Packages/MIES/DC_proc.ipf
@@ -311,7 +311,7 @@ end
 /// Precondition:
 /// - evaluation results wave from make_psc_analysis_wave()
 /// - psc kernel from make_psc_kernel()
-function ipsc_sweep(sweep, ad)
+static function ipsc_sweep(sweep, ad)
 	variable sweep, ad
 	string wave_name="PSC_analysis_AD_"+num2str(AD)
 	wave output_wave=root:psc_folder:$wave_name
@@ -958,12 +958,12 @@ Function MyWindowHook(STRUCT WMWinHookStruct &s)
 
 	switch(s.eventCode)
 		case 11: // keyboard event
-			
+
 			string win = s.winname
 			string info = CsrInfo(A, win)
 			string trace = StringByKey("TNAME", info)
 			variable index = NumberByKey("POINT", info)
-			
+
 			WAVE/Z peakX = xWaveRefFromTrace(win, trace)
 			ASSERT(WaveExists(peakX), "Missing peakX wave")
 
@@ -1036,7 +1036,7 @@ Function MyWindowHook(STRUCT WMWinHookStruct &s)
 				case 5: // mouse up
 					if(s.eventMod & (1 << 3))
 						print "ctrl + mouse click"
-						
+
 //						loc = AxisValFromPixel(win, "bottom", s.mouseLoc.h)
 // TOOD
 					endif
@@ -1046,4 +1046,4 @@ Function MyWindowHook(STRUCT WMWinHookStruct &s)
 	endswitch
 
 	return 0
-End
+End
diff --git a/Packages/MIES/MIES_SweepFormula.ipf b/Packages/MIES/MIES_SweepFormula.ipf
@@ -4424,7 +4424,7 @@ Function SF_GetNumberOfArguments(variable jsonId, string jsonPath)
 	return JSON_GetType(jsonId, jsonPath + "/0") == JSON_NULL ? 0 : size
 End
 
-static Function/DF SF_GetWorkingDF(string win)
+Function/DF SF_GetWorkingDF(string win)
 
 	DFREF dfr = BSP_GetFolder(GetMainWindow(win), MIES_BSP_PANEL_FOLDER)
 
@@ -4460,7 +4460,7 @@ static Function/WAVE SF_ParseArgument(string win, WAVE input, string opShort)
 	return out
 End
 
-static Function SF_CleanUpInput(WAVE input)
+Function SF_CleanUpInput(WAVE input)
 
 #ifndef SWEEPFORMULA_DEBUG
 	KillOrMoveToTrash(wv = input)
@@ -4724,16 +4724,9 @@ End
 
 Function/WAVE SF_GetArgumentSelect(variable jsonId, string jsonPath, string graph, string opShort, variable argNum)
 
-	variable numArgs
 	string msg
 
-	numArgs = SF_GetNumberOfArguments(jsonId, jsonPath)
-
-	if(argNum < numArgs)
-		WAVE/Z selectData = SF_GetArgumentSingle(jsonID, jsonPath, graph, opShort, argNum)
-	else
-		WAVE/Z selectData = SF_ExecuteFormula("select()", graph, singleResult=1)
-	endif
+	WAVE/Z selectData = SF_GetArgumentAsWave(jsonId, jsonPath, graph, opShort, argNum, defOp = "select()")
 
 	if(WaveExists(selectData))
 		sprintf msg, "Argument #%d of operation %s: input must have three columns", argNum, opShort