Skip to content

Commit

Permalink
Merge branch 'development', v1.87.0
Browse files Browse the repository at this point in the history
-- Fix bug saving wrong format indicating what folder format is associated with saved dataset. This leads to not finding ANY data files when reloading dataset next time Homer is launched. To reproduce comment out the fix and add ONE "error" snirf file (such as probe.snirf) which will not be loaded AND are in a different folder format than the valid dataset. Exit Homer and restart it. Homer will not find ANY data files when relaunching.
  • Loading branch information
jayd1860 committed May 8, 2024
2 parents a6b592d + 1d6a92a commit a2bdfcf
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
10 changes: 9 additions & 1 deletion DataTree/AcquiredData/DataFiles/DataFilesClass.m
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,15 @@ function GetDataSet(obj, skipsaveddata)
if ~isempty(obj.files)
break
end
end

% If we're here it means we still have not found a valid dataset in any of the formats looked
% at so far, but obj.dirFormats.type may have been set to non-zero because a invalid dataset
% may have been found by obj.FindDataSet() then flagged as invalid by obj.ErrorCheck(). So make
% sure to reset format type here otherwise wrong format could be associated with saved dataset.
% To reproduce comment out this fix and add ONE error snirf file that does NOT belong in the
% dataset due to being in incompatible format folder structure. BUG FIX: Jay Dubb, May 8, 2024
obj.dirFormats.type = 0;
end
if strcmp(mode,'noerrorcheck')
return
end
Expand Down
2 changes: 1 addition & 1 deletion DataTree/Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.1
1.22.0
2 changes: 1 addition & 1 deletion Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.86.0
1.87.0

0 comments on commit a2bdfcf

Please sign in to comment.