Skip to content

Commit

Permalink
Merge pull request #798 from HJZollner/develop
Browse files Browse the repository at this point in the history
Prepare release and bug fix Windows compiled
  • Loading branch information
HJZollner authored Nov 26, 2024
2 parents e86c3a5 + 16ad296 commit 3256fb4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions fit/code/osp_fitInitialise.m
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,15 @@
end
end

% For the compiled Windwos version we are suddenly seeing an additonal
% fileseparator in the basisset string. Fix this by removing the leading
% character for Windows if it is a fileseparator.
if ispc
if strcmp(MRSCont.opts.fit.basisSetFile(1),filesep)
MRSCont.opts.fit.basisSetFile = MRSCont.opts.fit.basisSetFile(2:end);
end
end

% The workflow will differ depending on whether we fit entirely within
% Osprey, or whether we are wrapping the LCModel binaries.
switch MRSCont.opts.fit.method
Expand Down
4 changes: 2 additions & 2 deletions settings/version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{"Version": "2.8.5",
"Date": "November 7, 2024",
{"Version": "2.9.0",
"Date": "November 26, 2024",
"Description": "First digit for major releases, second digit for regular compiled releases, third digit for each commit to the develop branch. "}

0 comments on commit 3256fb4

Please sign in to comment.