From 1e731f21118896c9f98e8412d47cdfa7b1317a96 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Fri, 16 Feb 2024 11:42:09 +0000
Subject: [PATCH] Fix some interfaces
---
src/all_building_blocks/trapezoids.jl | 3 +++
src/all_sequences/epi_readouts.jl | 27 ++++++++++++++++---
.../constant_gradient_blocks.jl | 2 +-
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/all_building_blocks/trapezoids.jl b/src/all_building_blocks/trapezoids.jl
index 1f293d9..2dc87de 100644
--- a/src/all_building_blocks/trapezoids.jl
+++ b/src/all_building_blocks/trapezoids.jl
@@ -183,6 +183,9 @@ function LineReadout(adc::ADC; ramp_overlap=nothing, orientation=nothing, group=
return res
end
+Base.keys(::LineReadout) = (Val(:rise), Val(:flat), Val(:adc), Val(:fall))
+Base.getindex(lr::LineReadout, ::Val{:adc}) = lr.adc
+
ramp_overlap(lr::LineReadout) = lr.ramp_overlap
inverse_fov(lr::LineReadout) = 1e3 * dwell_time(lr.adc) * gradient_strength(lr.trapezoid)
inverse_voxel_size(lr::LineReadout) = 1e3 * duration(lr.adc) * gradient_strength(lr.trapezoid)
diff --git a/src/all_sequences/epi_readouts.jl b/src/all_sequences/epi_readouts.jl
index e6a998d..3ea831b 100644
--- a/src/all_sequences/epi_readouts.jl
+++ b/src/all_sequences/epi_readouts.jl
@@ -2,7 +2,7 @@ module EPIReadouts
import ...AllBuildingBlocks: LineReadout, Trapezoid, opposite_kspace_lines
import ...Components: ADC
import ...Variables: get_free_variable, VariableType, qval, qvec, set_simple_constraints!, resolution, inverse_voxel_size, inverse_fov, resolution, get_readout, apply_simple_constraint!
-import ..BaseSequences: BaseSequence
+import ..BaseSequences: BaseSequence, get_index_single_TR
"""
EPIReadout(resolution; ky_lines=-resolution[2]:resolution[2], recenter=false, group=:FOV, variables...)
@@ -21,7 +21,7 @@ Defines an (accelerated) EPI readout.
- [`oversample`](@ref): by how much to oversample in the frequency-encode direcion.
- [`dwell_time`](@ref): dwell time in the frequency-encode direction
"""
-struct EPIReadout <: BaseSequence{0}
+struct EPIReadout{N} <: BaseSequence{N}
start_gradient :: Trapezoid
positive_line :: LineReadout
negative_line :: LineReadout
@@ -39,7 +39,7 @@ function EPIReadout(resolution::AbstractVector{<:Integer}; recenter=false, group
ky_lines = -resolution[2]:resolution[2]
end
(pos, neg) = opposite_kspace_lines(; resolution=resolution[1], orientation=[1, 0, 0], group=group)
- res = EPIReadout(
+ res = EPIReadout{2 * length(ky_lines) + recenter}(
Trapezoid(group=group),
pos,
neg,
@@ -53,6 +53,9 @@ function EPIReadout(resolution::AbstractVector{<:Integer}; recenter=false, group
sign = isodd(length(ky_lines)) ? -1 : 1
apply_simple_constraint!(qvec(res.recenter_gradient), VariableType[sign * qval(pos)/2, -ky_lines[end] * res.ky_step, 0.])
end
+ for shift in unique(ky_lines[2:end] - ky_lines[1:end-1])
+ res.blips[shift] = Trapezoid(orientation=[0, shift > 0 ? 1 : -1, 0], group=group, qval=abs(shift) * res.ky_step)
+ end
set_simple_constraints!(res, variables)
return res
end
@@ -62,5 +65,23 @@ inverse_voxel_size(epi::EPIReadout) = [inverse_voxel_size(epi.positive_line), 1e
resolution(epi::EPIReadout) = [resolution(epi.positive_line), maximum(abs.(epi.ky_lines))]
get_readout(epi::EPIReadout) = epi.positive_line
+function get_index_single_TR(epi::EPIReadout, index::Integer)
+ if index == 1
+ return epi.start_gradient
+ elseif !isnothing(epi.recenter_gradient) && index == length(epi)
+ return epi.recenter_gradient
+ end
+ current_line = div(index, 2, RoundDown)
+ if isodd(index)
+ line_shift = epi.ky_lines[current_line + 1] - epi.ky_lines[current_line]
+ return epi.blips[line_shift]
+ else
+ if isodd(current_line)
+ return epi.positive_line
+ else
+ return epi.negative_line
+ end
+ end
+end
end
\ No newline at end of file
diff --git a/src/components/gradient_waveforms/constant_gradient_blocks.jl b/src/components/gradient_waveforms/constant_gradient_blocks.jl
index 508cbbf..d04af4c 100644
--- a/src/components/gradient_waveforms/constant_gradient_blocks.jl
+++ b/src/components/gradient_waveforms/constant_gradient_blocks.jl
@@ -35,7 +35,7 @@ gradient_strength(cgb::ConstantGradient) = cgb.gradient_strength
slew_rate(::ConstantGradient1D) = 0.
slew_rate(::ConstantGradient3D) = zero(SVector{3, Float64})
qval(cgb::ConstantGradient1D) = duration(cgb) * gradient_strength(cgb) * 2Ï€
-qval(cgb::ConstantGradient3D) = @. duration(cgb) * gradient_strength(cgb) * 2Ï€
+qval(cgb::ConstantGradient3D) = duration(cgb) .* gradient_strength(cgb) .* 2Ï€
_mult(g1::VariableType, g2::VariableType) = g1 * g2
_mult(g1::AbstractVector, g2::AbstractVector) = g1 .* permutedims(g2)
--
GitLab