Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix displaying MIES data from 2015 #2334

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Fix displaying MIES data from 2015 #2334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97d1b1c
UpgradeLabNotebook: Fix upgrade of NOTE_INDEX for textualValues waves
t-b Jan 28, 2025
bcb8e2e
CreateTiledChannelGraph: Account for very early labnotebooks in fallb…
t-b Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Packages/MIES/MIES_Browser_Plotter.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ Function CreateTiledChannelGraph(string graph, WAVE config, variable sweepNo, WA
ASSERT_TS(WaveExists(ADCsFromLBN), "Labnotebook is too old for workaround.")

WAVE statusHS = LBN_GetNumericWave()
statusHS[] = IsFinite(ADCsFromLBN[p]) && IsFinite(DACsFromLBN[p])
// 562439857 (Introduce a nineth layer in the labnotebooks for storing headstage independent data, 2015-10-28)
statusHS[0, NUM_HEADSTAGES - 1] = IsFinite(ADCsFromLBN[p]) && IsFinite(DACsFromLBN[p])
endif

BSP_RemoveDisabledChannels(channelSelWave, ADCs, DACs, statusHS, numericalValues, sweepNo)
Expand Down
2 changes: 1 addition & 1 deletion Packages/MIES/MIES_Constants.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Constant SWEEP_EPOCH_VERSION = 9
/// - New/Changed layers of entries
///
///@{
Constant LABNOTEBOOK_VERSION = 77
Constant LABNOTEBOOK_VERSION = 78
Constant RESULTS_VERSION = 3
///@}

Expand Down
2 changes: 1 addition & 1 deletion Packages/MIES/MIES_WaveDataFolderGetters.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@ static Function UpgradeLabNotebook(string device)
nextFreeRow = GetNumberFromWaveNote(textualValues, NOTE_INDEX)

if(IsNaN(nextFreeRow))
FindValue/FNAN/RMD=[][timeStampColumn][0]/R textualValues
FindValue/TEXT=("")/RMD=[][timeStampColumn][0]/R textualValues
if(!(V_row >= 0))
V_row = DimSize(textualValues, ROWS)
endif
Expand Down
2 changes: 1 addition & 1 deletion Packages/tests/Basic/UTF_Labnotebook.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@ Function LabnotebookUpgradeMissingNoteIndexTextual()
Note/K textualKeys

textualValues[][][] = ""
Redimension/N=(0, -1, -1) textualValues
Redimension/N=(1, -1, -1) textualValues

MIES_WAVEGETTERS#UpgradeLabNotebook(device)

Expand Down
10 changes: 10 additions & 0 deletions Packages/tests/HistoricData/UTF_HistoricAnalysisBrowser.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,13 @@ static Function TestGetChannelInfo()
Make/FREE/T channelInfoRef = {{"0"}, {"root:MIES:Analysis:workFolder:AB_LoadSweepsFromIgorData:Dev1:sweep:X_0:AD_0"}, {"0"}}
CHECK_EQUAL_TEXTWAVES(channelInfo, channelInfoRef, mode = WAVE_DATA)
End

static Function TestLabnotebookFallbackPathsInSweepDisplay()

string abWin, sweepBrowsers, win

Make/FREE/T files = {"input:very_very_early_mies-data_Rbp4-Cre_KL100;Ai14-206137.04.02.pxp"}
DownloadFilesIfRequired(files)
[abWin, sweepBrowsers] = OpenAnalysisBrowser(files, loadSweeps = 1)
CHECK_NO_RTE()
End