From 1060dcbb4f5077f6a21ed9152b9b78369e0d3cc8 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Wed, 21 Feb 2024 12:38:45 +0000
Subject: [PATCH] Fix calling of readout
---
src/containers/sequences.jl | 4 ++--
src/parts/epi_readouts.jl | 2 +-
src/parts/helper_functions.jl | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/containers/sequences.jl b/src/containers/sequences.jl
index 3ff4625..47882e5 100644
--- a/src/containers/sequences.jl
+++ b/src/containers/sequences.jl
@@ -6,7 +6,7 @@ import StaticArrays: SVector
import JuMP: @constraint
import ...Variables: get_free_variable, TR, VariableType, duration, variables, VariableNotAvailable, Variables, set_simple_constraints!
import ...BuildSequences: global_model
-import ...Components: EventComponent
+import ...Components: EventComponent, NoGradient
import ..Abstract: ContainerBlock, start_time
import ..BuildingBlocks: Wait, BuildingBlock, BaseBuildingBlock
@@ -127,6 +127,6 @@ Converst object into something that can be included in the sequence:
to_block(cb::ContainerBlock) = cb
to_block(s::Symbol) = to_block(Val(s))
to_block(s::Union{VariableType, Nothing, Val{:min}, Val{:max}}) = Wait(s)
-to_block(ec::EventComponent) = BuildingBlock([], [(0, ec)]; duration=duration(ec))
+to_block(ec::EventComponent) = BuildingBlock([NoGradient(duration(ec))], [(1, ec)])
end
diff --git a/src/parts/epi_readouts.jl b/src/parts/epi_readouts.jl
index f4ca49e..dbfad45 100644
--- a/src/parts/epi_readouts.jl
+++ b/src/parts/epi_readouts.jl
@@ -32,7 +32,7 @@ struct EPIReadout{N} <: BaseSequence{N}
ky_lines :: AbstractVector{<:Integer}
end
-function EPIReadout(resolution::AbstractVector{<:Integer}; recenter=false, group=:FOV, ky_lines=nothing, variables...)
+function EPIReadout(; resolution::AbstractVector{<:Integer}, recenter=false, group=:FOV, ky_lines=nothing, variables...)
if length(resolution) != 2
error("EPIReadout expects the image resolution in the x- and y-direction.")
end
diff --git a/src/parts/helper_functions.jl b/src/parts/helper_functions.jl
index 60c5b13..b52d065 100644
--- a/src/parts/helper_functions.jl
+++ b/src/parts/helper_functions.jl
@@ -154,7 +154,7 @@ function readout_event(; type, optimise=false, scanner=nothing, variables...)
if !(type in keys(func_dict))
error("Readout event type `$type` has not been implemented. Please use one of $(keys(func_dict)).")
end
- return func_dict[type](real_variables...)
+ return func_dict[type](; real_variables...)
end
end
--
GitLab