Skip to content
Snippets Groups Projects
Verified Commit 2f9b35bc authored by Michiel Cottaar's avatar Michiel Cottaar
Browse files

Remove references to fixed gradients

parent 7d7948f8
No related branches found
No related tags found
No related merge requests found
...@@ -32,8 +32,8 @@ export WaitBlock ...@@ -32,8 +32,8 @@ export WaitBlock
import .Pulses: InstantRFPulseBlock, ConstantPulse, SincPulse, FixedPulse import .Pulses: InstantRFPulseBlock, ConstantPulse, SincPulse, FixedPulse
export InstantRFPulseBlock, ConstantPulse, SincPulse, FixedPulse export InstantRFPulseBlock, ConstantPulse, SincPulse, FixedPulse
import .Gradients: PulsedGradient, InstantGradientBlock, FixedGradient import .Gradients: PulsedGradient, InstantGradientBlock
export PulsedGradient, InstantGradientBlock, FixedGradient export PulsedGradient, InstantGradientBlock
import .Readouts: InstantReadout import .Readouts: InstantReadout
export InstantReadout export InstantReadout
......
...@@ -10,22 +10,16 @@ All other gradient profiles are made up of [`ChangingGradientBlock`](@ref) and [ ...@@ -10,22 +10,16 @@ All other gradient profiles are made up of [`ChangingGradientBlock`](@ref) and [
They are still included here for clarity: They are still included here for clarity:
- [`PulsedGradient`](@ref) - [`PulsedGradient`](@ref)
- [`GradientWaveform`](@ref) - [`GradientWaveform`](@ref)
- [`FixedGradient`](@ref)
""" """
module Gradients module Gradients
include("changing_gradient_blocks.jl") include("changing_gradient_blocks.jl")
include("constant_gradient_blocks.jl") include("constant_gradient_blocks.jl")
include("slice_selects.jl")
#include("integrate_gradients.jl")
include("fixed_gradients.jl")
include("pulsed_gradients.jl")
include("instant_gradients.jl") include("instant_gradients.jl")
import ..BuildingBlocks: GradientBlock
import .PulsedGradients: PulsedGradient import ..BuildingBlocks: GradientBlock
import .ChangingGradientBlocks: ChangingGradientBlock
import .ConstantGradientBlocks: ConstantGradientBlock
import .InstantGradients: InstantGradientBlock import .InstantGradients: InstantGradientBlock
import .FixedGradients: FixedGradient
end end
\ No newline at end of file
...@@ -4,7 +4,6 @@ import JuMP: @constraint, @variable, Model, owner_model, AbstractJuMPScalar ...@@ -4,7 +4,6 @@ import JuMP: @constraint, @variable, Model, owner_model, AbstractJuMPScalar
import ...Variables: qvec, bmat_gradient, duration, variables, get_free_variable, VariableType import ...Variables: qvec, bmat_gradient, duration, variables, get_free_variable, VariableType
import ...BuildingBlocks: GradientBlock, fixed import ...BuildingBlocks: GradientBlock, fixed
import ...BuildSequences: @global_model_constructor import ...BuildSequences: @global_model_constructor
import ..FixedGradients: FixedInstantGradient
""" """
InstantGradientBlock(; orientation=nothing, qval=nothing, qvec=nothing, rotate=nothing, scale=nothing) InstantGradientBlock(; orientation=nothing, qval=nothing, qvec=nothing, rotate=nothing, scale=nothing)
......
...@@ -12,7 +12,7 @@ all_variables_symbols = [ ...@@ -12,7 +12,7 @@ all_variables_symbols = [
:pulse => [ :pulse => [
:flip_angle => "The flip angle of the RF pulse in degrees", :flip_angle => "The flip angle of the RF pulse in degrees",
:amplitude => "The maximum amplitude of an RF pulse in kHz" :amplitude => "The maximum amplitude of an RF pulse in kHz",
:phase => "The angle of the phase of an RF pulse in KHz", :phase => "The angle of the phase of an RF pulse in KHz",
:frequency => "The off-resonance frequency of an RF pulse (relative to the Larmor frequency of water) in KHz", :frequency => "The off-resonance frequency of an RF pulse (relative to the Larmor frequency of water) in KHz",
:bandwidth => "Bandwidth of the RF pulse in kHz. If you are going to divide by the bandwidth, it can be more efficient to use the [`inverse_bandwidth`](@ref).", :bandwidth => "Bandwidth of the RF pulse in kHz. If you are going to divide by the bandwidth, it can be more efficient to use the [`inverse_bandwidth`](@ref).",
......
...@@ -9,7 +9,6 @@ import ...Variables: qvec, rise_time, flat_time, slew_rate, gradient_strength, v ...@@ -9,7 +9,6 @@ import ...Variables: qvec, rise_time, flat_time, slew_rate, gradient_strength, v
import ...BuildingBlocks: duration, set_simple_constraints!, fixed import ...BuildingBlocks: duration, set_simple_constraints!, fixed
import ...BuildSequences: @global_model_constructor import ...BuildSequences: @global_model_constructor
import ..Generic: GenericWaveform import ..Generic: GenericWaveform
import ..FixedGradients: FixedGradient
import ..ChangingGradientBlocks: ChangingGradientBlock import ..ChangingGradientBlocks: ChangingGradientBlock
import ..ConstantGradientBlocks: ConstantGradientBlock import ..ConstantGradientBlocks: ConstantGradientBlock
...@@ -140,16 +139,4 @@ start_time(pg::TrapezoidGradient, ::Val{:fall}) = δ(pg) ...@@ -140,16 +139,4 @@ start_time(pg::TrapezoidGradient, ::Val{:fall}) = δ(pg)
variables(::Type{<:TrapezoidGradient}) = [qval, δ, gradient_strength, duration, rise_time, flat_time] variables(::Type{<:TrapezoidGradient}) = [qval, δ, gradient_strength, duration, rise_time, flat_time]
function fixed(block::TrapezoidGradient)
grad = value.(gradient_strength(block))
t_rise = value(rise_time(block))
t_d = value(δ(block))
return FixedGradient(
[0., t_rise, t_d, td + t_rise],
[zeros(3), grad, grad, zeros(3)];
rotate=rotate
)
end
end end
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment