SB_GetSweepDataFolder: Drop sweepNo argument

In general we can't map a sweep number to a sweep data folder in the sweep
browser as we can have the same sweep number from multiple experiments.

Drop that argument as it is now not used anymore.

See also #2151.

Author: t-b

Packages/MIES/MIES_AnalysisBrowser_SweepBrowser.ipf

@@ -31,43 +31,13 @@ Function SB_TranslateSBMapIndexToABMapIndex(string win, variable sbIndex)
 	return V_row
 End
 
-static Function SB_GetSweepIndexFromMap(WAVE/T sweepMap, variable sweepNo)
-
-	variable cIndex
-
-	cIndex = FindDimLabel(sweepMap, COLS, "Sweep")
-	FindValue/RMD=[][cIndex]/TEXT=(num2istr(sweepNo))/TXOP=4 sweepMap
-
-#ifdef AUTOMATED_TESTING
-	variable dummy = V_row
-	if(V_row >= 0)
-		FindValue/RMD=[dummy + 1,][cIndex]/TEXT=(num2istr(sweepNo))/TXOP=4 sweepMap
-		ASSERT(V_row == -1, "Found results for multiple experiments")
-	endif
-	V_row = dummy
-#endif // AUTOMATED_TESTING
-
-	return (V_row == -1) ? NaN : V_row
-End
-
-/// @brief Return the sweep data folder for either a given index or sweepNo
-///        If a sweepNo is given then the result for the first sweep found with that number is returned
-Function/DF SB_GetSweepDataFolder(WAVE/T sweepMap, [variable sweepNo, variable index])
+/// @brief Return the sweep data folder for the given index
+Function/DF SB_GetSweepDataFolder(WAVE/T sweepMap, variable mapIndex)
 
 	string dataFolder, device
-	variable cIndex
-
-	if(!ParamIsDefault(index) && ParamIsDefault(sweepNo))
-		ASSERT(index >= 0 && index < DimSize(sweepMap, ROWS), "Invalid index")
-	elseif(ParamIsDefault(index) && !ParamIsDefault(sweepNo))
-		index = SB_GetSweepIndexFromMap(sweepMap, sweepNo)
-		if(IsNaN(index))
-			return $""
-		endif
-	endif
 
-	dataFolder = sweepMap[index][%DataFolder]
-	device     = sweepMap[index][%Device]
+	dataFolder = sweepMap[mapIndex][%DataFolder]
+	device     = sweepMap[mapIndex][%Device]
 
 	return GetAnalysisSweepPath(dataFolder, device)
 End

Packages/MIES/MIES_AnalysisFunctions_Dashboard.ipf

@@ -320,7 +320,7 @@ static Function AD_FillWaves(string win, WAVE/T list, WAVE/T info)
 			endif
 
 			if(!isDataBrowser)
-				DFREF sweepDFR = SB_GetSweepDataFolder(sweepMap, index = mapIndex)
+				DFREF sweepDFR = SB_GetSweepDataFolder(sweepMap, mapIndex)
 			endif
 
 			msg = AD_GetResultMessage(anaFuncType, passed, numericalValues, textualValues, sweepNo, sweepDFR, headstage, ongoingDAQ, waMode)

Packages/MIES/MIES_BrowserSettingsPanel.ipf

@@ -1257,7 +1257,7 @@ Function BSP_ButtonProc_RestoreData(STRUCT WMButtonAction &ba) : ButtonControl
 
 				numEntries = GetNumberFromWaveNote(sweepMap, NOTE_INDEX)
 				for(i = 0; i < numEntries; i += 1)
-					DFREF sweepDFR       = SB_GetSweepDataFolder(sweepMap, index = i)
+					DFREF sweepDFR       = SB_GetSweepDataFolder(sweepMap, i)
 					DFREF singleSweepDFR = GetSingleSweepFolder(sweepDFR, sweepNo)
 					ReplaceWaveWithBackupForAll(singleSweepDFR)
 				endfor