From 16ad29626308efb669730857c5673caa23ca82e3 Mon Sep 17 00:00:00 2001 From: Helge <47348963+HJZollner@users.noreply.github.com> Date: Tue, 26 Nov 2024 10:58:15 -0500 Subject: [PATCH] Prepare release and bug fix Windows compiled - preparing a release for Zenodo DOI - fixing compiled Windows version --- fit/code/osp_fitInitialise.m | 9 +++++++++ settings/version.json | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fit/code/osp_fitInitialise.m b/fit/code/osp_fitInitialise.m index c3fec23c..0c69c1aa 100644 --- a/fit/code/osp_fitInitialise.m +++ b/fit/code/osp_fitInitialise.m @@ -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 diff --git a/settings/version.json b/settings/version.json index cfdca35f..8b221835 100644 --- a/settings/version.json +++ b/settings/version.json @@ -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. "}