diff --git a/src/MRIBuilder.jl b/src/MRIBuilder.jl index b74845d652e0c5338e9acfaca601f4018f6798ae..4e7aed3e19e10e0ee858e5bf3363969eb5803193 100644 --- a/src/MRIBuilder.jl +++ b/src/MRIBuilder.jl @@ -32,8 +32,8 @@ export WaitBlock import .Pulses: InstantRFPulseBlock, ConstantPulse, SincPulse, FixedPulse export InstantRFPulseBlock, ConstantPulse, SincPulse, FixedPulse -import .Gradients: PulsedGradient, InstantGradientBlock, FixedGradient -export PulsedGradient, InstantGradientBlock, FixedGradient +import .Gradients: PulsedGradient, InstantGradientBlock +export PulsedGradient, InstantGradientBlock import .Readouts: InstantReadout export InstantReadout diff --git a/src/gradients/gradients.jl b/src/gradients/gradients.jl index 9a16a9c5ca20f384b5a92322dca5dbe854ff5b64..e9a980d411f7dd6c8d3708f2cf4be100d3759231 100644 --- a/src/gradients/gradients.jl +++ b/src/gradients/gradients.jl @@ -10,22 +10,16 @@ All other gradient profiles are made up of [`ChangingGradientBlock`](@ref) and [ They are still included here for clarity: - [`PulsedGradient`](@ref) - [`GradientWaveform`](@ref) -- [`FixedGradient`](@ref) """ module Gradients include("changing_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") -import ..BuildingBlocks: GradientBlock -import .PulsedGradients: PulsedGradient +import ..BuildingBlocks: GradientBlock +import .ChangingGradientBlocks: ChangingGradientBlock +import .ConstantGradientBlocks: ConstantGradientBlock import .InstantGradients: InstantGradientBlock -import .FixedGradients: FixedGradient end \ No newline at end of file diff --git a/src/gradients/instant_gradients.jl b/src/gradients/instant_gradients.jl index 9b1222b5be5472a02ccc10e6246c2890295fe464..15866257ba4c369100e908b18fc5f248620a7f87 100644 --- a/src/gradients/instant_gradients.jl +++ b/src/gradients/instant_gradients.jl @@ -4,7 +4,6 @@ import JuMP: @constraint, @variable, Model, owner_model, AbstractJuMPScalar import ...Variables: qvec, bmat_gradient, duration, variables, get_free_variable, VariableType import ...BuildingBlocks: GradientBlock, fixed import ...BuildSequences: @global_model_constructor -import ..FixedGradients: FixedInstantGradient """ InstantGradientBlock(; orientation=nothing, qval=nothing, qvec=nothing, rotate=nothing, scale=nothing) diff --git a/src/variables.jl b/src/variables.jl index 4b6b9d00576c06988088aa618748859d85b89a5a..afdc4232266f5b5812cbc42d9c4b7683792c9f23 100644 --- a/src/variables.jl +++ b/src/variables.jl @@ -12,7 +12,7 @@ all_variables_symbols = [ :pulse => [ :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", :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).", diff --git a/src/waveforms/pulsed_gradients.jl b/src/waveforms/pulsed_gradients.jl index 4f719ddc5a5aa6884ae7d9d030da78f4b095f66f..a6271640967d878d91f3b27a8dc9d23a018b55be 100644 --- a/src/waveforms/pulsed_gradients.jl +++ b/src/waveforms/pulsed_gradients.jl @@ -9,7 +9,6 @@ import ...Variables: qvec, rise_time, flat_time, slew_rate, gradient_strength, v import ...BuildingBlocks: duration, set_simple_constraints!, fixed import ...BuildSequences: @global_model_constructor import ..Generic: GenericWaveform -import ..FixedGradients: FixedGradient import ..ChangingGradientBlocks: ChangingGradientBlock import ..ConstantGradientBlocks: ConstantGradientBlock @@ -140,16 +139,4 @@ start_time(pg::TrapezoidGradient, ::Val{:fall}) = δ(pg) 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 \ No newline at end of file