Merge pull request #2183 from AllenInstitute/feature/2183-refactor-mi…

…esutilities_2 MiesUtilities refactor part 2
AllenInstitute · Jul 15, 2024 · 2b75d33 · 2b75d33
2 parents 9efa83b + f2522c7
commit 2b75d33
Show file tree

Hide file tree

Showing 32 changed files with 8,627 additions and 8,433 deletions.
diff --git a/Packages/MIES/MIES_AnalysisBrowser.ipf b/Packages/MIES/MIES_AnalysisBrowser.ipf
@@ -2300,7 +2300,7 @@ static Function AB_LoadStimsetRAW(expFilePath, stimset, overwrite)
 		WB_KillStimset(stimset)
 	endif
 
-	channelType = GetStimSetType(stimset)
+	channelType = WB_GetStimSetType(stimset)
 
 	if(channeltype == CHANNEL_TYPE_UNKNOWN)
 		return 1
@@ -2347,7 +2347,7 @@ static Function AB_LoadStimsetTemplateWaves(expFilePath, stimset)
 	parameterWaves = AddListItem(WB_GetParameterWaveName(stimset, STIMSET_PARAM_WPT), parameterWaves)
 	parameterWaves = AddListItem(WB_GetParameterWaveName(stimset, STIMSET_PARAM_SEGWVTYPE), parameterWaves)
 
-	channelType = GetStimSetType(stimset)
+	channelType = WB_GetStimSetType(stimset)
 
 	if(channeltype == CHANNEL_TYPE_UNKNOWN)
 		return 1

diff --git a/Packages/MIES/MIES_AnalysisFunctionManagement.ipf b/Packages/MIES/MIES_AnalysisFunctionManagement.ipf
@@ -246,7 +246,7 @@ Function AFM_UpdateAnalysisFunctionWave(device)
 		endif
 
 		for(j = 0; j < TOTAL_NUM_EVENTS; j += 1)
-			func = ExtractAnalysisFuncFromStimSet(stimSet, j)
+			func = WB_ExtractAnalysisFuncFromStimSet(stimSet, j)
 
 			if(WhichListItem(func, possibleFunctions) == -1) // not valid
 				continue
@@ -255,6 +255,6 @@ Function AFM_UpdateAnalysisFunctionWave(device)
 			analysisFunctions[i][j] = func
 		endfor
 
-		analysisFunctions[i][ANALYSIS_FUNCTION_PARAMS] = ExtractAnalysisFunctionParams(stimSet)
+		analysisFunctions[i][ANALYSIS_FUNCTION_PARAMS] = WB_ExtractAnalysisFunctionParams(stimSet)
 	endfor
 End