Skip to content

Commit

Permalink
PSX_GenerateComboKey: Fix it for the sweepbrowser
Browse files Browse the repository at this point in the history
We need to always fetch the sweepMap in the sweepbrowser. And not only
when we have no device.

Bug introduced in bf10c95 (MIES_SweepFormula_PSX.ipf: Handle
sweepbrowser labnotebooks correctly, 2024-10-14).
  • Loading branch information
t-b committed Nov 19, 2024
1 parent a4d0676 commit 867eb26
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Packages/MIES/MIES_SweepFormula_PSX.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -2987,11 +2987,14 @@ static Function/S PSX_GenerateComboKey(string graph, WAVE selectData, WAVE range
// Introduced in 7e903ed8 (GetSweepSettingsTextWave: Add device as entry, 2023-01-03)
device = GetLastSettingTextIndep(textualValues, sweepNo, "Device", DATA_ACQUISITION_MODE)

if(!isDataBrowser)
WAVE/T sweepMap = SB_GetSweepMap(graph)
endif

if(IsEmpty(device))
if(isDataBrowser)
device = BSP_GetDevice(graph)
else
WAVE/T sweepMap = SB_GetSweepMap(graph)
device = sweepMap[mapIndex][%Device]
endif
endif
Expand Down

0 comments on commit 867eb26

Please sign in to comment.