From b4c28fb41035a9e76fb9cdd1edba715dd5cd405c Mon Sep 17 00:00:00 2001 From: Paul Sharp <44529197+DrPaulSharp@users.noreply.github.com> Date: Tue, 7 May 2024 16:14:41 +0100 Subject: [PATCH 1/2] Updates README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e97c9ba9..203132d6 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,14 @@ To install in local directory: pip install -e . matlabengine is an optional dependency only required for Matlab custom functions. The version of matlabengine should match the version of Matlab installed on the machine. This can be installed as shown below: + pip install -e .[Matlab-2023a] -Development dependencies can be installed as shown below +Development dependencies can be installed as shown below + pip install -e .[Dev] To build wheel: + pip install build python -m build --wheel From ccc0beb488b0c6e1da4068295174ccc1ee6d06f5 Mon Sep 17 00:00:00 2001 From: Paul Sharp <44529197+DrPaulSharp@users.noreply.github.com> Date: Tue, 7 May 2024 16:49:01 +0100 Subject: [PATCH 2/2] Bug fix in dummy value for "contrastQzshifts" --- RAT/inputs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RAT/inputs.py b/RAT/inputs.py index d950d0fd..70526caa 100644 --- a/RAT/inputs.py +++ b/RAT/inputs.py @@ -118,14 +118,14 @@ def make_problem(project: RAT.Project) -> ProblemDefinition: problem.params = [param.value for param in project.parameters] problem.bulkIn = [param.value for param in project.bulk_in] problem.bulkOut = [param.value for param in project.bulk_out] - problem.qzshifts = [] + problem.qzshifts = [0.0] problem.scalefactors = [param.value for param in project.scalefactors] problem.domainRatio = [param.value for param in project.domain_ratios] problem.backgroundParams = [param.value for param in project.background_parameters] problem.resolutionParams = [param.value for param in project.resolution_parameters] problem.contrastBulkIns = [project.bulk_in.index(contrast.bulk_in, True) for contrast in project.contrasts] problem.contrastBulkOuts = [project.bulk_out.index(contrast.bulk_out, True) for contrast in project.contrasts] - problem.contrastQzshifts = [1] * len(project.contrasts) # This is marked as "to do" in RAT + problem.contrastQzshifts = [0] * len(project.contrasts) # This is marked as "to do" in RAT problem.contrastScalefactors = [project.scalefactors.index(contrast.scalefactor, True) for contrast in project.contrasts] problem.contrastDomainRatios = [project.domain_ratios.index(contrast.domain_ratio, True) if hasattr(contrast, 'domain_ratio') else 0 for contrast in project.contrasts]