From 90dcdb97ecd14f998a97e07a09f8ce438cebf2a7 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Wed, 21 Feb 2024 14:30:35 +0000
Subject: [PATCH] Fix variables filtering
---
src/parts/helper_functions.jl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/parts/helper_functions.jl b/src/parts/helper_functions.jl
index c553d07..7afca36 100644
--- a/src/parts/helper_functions.jl
+++ b/src/parts/helper_functions.jl
@@ -145,7 +145,7 @@ function readout_event(; type=:epi, optimise=false, scanner=nothing, variables..
if type == :instant
optimise = false # there is nothing to optimise
end
- real_variables = Dict(key => value for (key, value) in pairs(variables) if (!isnothing(value)) && (value isa AbstractVector && !all(isnothing.(value))))
+ real_variables = Dict(key => value for (key, value) in pairs(variables) if !(isnothing(value) || (value isa AbstractVector && all(isnothing.(value)))))
build_sequence(scanner; optimise=optimise) do
func_dict = Dict(
:epi => EPIReadout,
@@ -172,7 +172,7 @@ Returns two DWI gradients that are guaranteed to cancel each other out.
- `scanner`: Used for testing. Do not set this parameter at this level (instead set it for the total sequence using [`build_sequence`](@ref)).
"""
function dwi_gradients(; type=:trapezoid, optimise=false, scanner=nothing, refocus=true, orientation=[1, 0, 0], group=:DWI, variables...)
- real_variables = Dict(key => value for (key, value) in pairs(variables) if (!isnothing(value)) && (value isa AbstractVector && !all(isnothing.(value))))
+ real_variables = Dict(key => value for (key, value) in pairs(variables) if !(isnothing(value) || (value isa AbstractVector && all(isnothing.(value)))))
func_dict = Dict(
:trapezoid => Trapezoid,
--
GitLab