Merge pull request #2050 from AllenInstitute/bugfix/2050-fix_abloadwave

AB: bugfix AB_LoadWave does not retrieve wave from the correct DF
AllenInstitute · Mar 13, 2024 · 55ca3c1 · 55ca3c1
2 parents f99b9c6 + e8d454c
commit 55ca3c1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/Packages/MIES/MIES_AnalysisBrowser.ipf b/Packages/MIES/MIES_AnalysisBrowser.ipf
@@ -2472,8 +2472,7 @@ static Function AB_LoadWave(expFilePath, fullPath, overwrite)
 		return 1
 	endif
 
-	WAVE wv = $(GetIndexedObjNameDFR(newDFR, 1, 0))
-	SetDataFolder root:
+	WAVE/SDFR=newDFR wv = $(GetIndexedObjNameDFR(newDFR, 1, 0))
 	createDFWithAllParents(dataFolder)
 	MoveWave wv, $fullPath
 

diff --git a/Packages/tests/Basic/UTF_AnalysisBrowserTest.ipf b/Packages/tests/Basic/UTF_AnalysisBrowserTest.ipf
@@ -113,3 +113,28 @@ static Function TestAB_LoadDataWrapper()
 	numLoaded = MIES_AB#AB_LoadDataWrapper(tmpDFR, expFilePath, "root:", wName, typeFlags=COUNTOBJECTS_WAVES)
 	CHECK_GT_VAR(numLoaded, 0)
 End
+
+static Function TestABLoadWave()
+
+	variable err
+	string expFilePath
+	string expName = "TestAB_LoadWave.pxp"
+	string wName = "wAvE1"
+
+	WAVE/Z wv = root:$wName
+	KillOrMoveToTrash(wv=wv)
+
+	Make root:$wName/WAVE=wv
+	SaveExperiment/P=home as expName
+
+	KillOrMoveToTrash(wv=wv)
+
+	PathInfo home
+	expFilePath = S_path + expName
+	err = MIES_AB#AB_LoadWave(expFilePath, "root:" + wName, 1)
+	CHECK_EQUAL_VAR(err, 0)
+
+	WAVE/Z wv = root:$wName
+	CHECK_WAVE(wv, NUMERIC_WAVE)
+
+End