diff --git a/src/overlapping/gradient_pulses/gradient_pulses.jl b/src/overlapping/gradient_pulses/gradient_pulses.jl new file mode 100644 index 0000000000000000000000000000000000000000..fcab143f963fed07d2ac119a48b48e1883ba4c43 --- /dev/null +++ b/src/overlapping/gradient_pulses/gradient_pulses.jl @@ -0,0 +1,8 @@ +module GradientPulses +include("trapezoid_gradients.jl") +include("spoilt_slice_selects.jl") + +import .TrapezoidGradients: TrapezoidGradient +import .SpoiltSliceSelects: SpoiltSliceSelect + +end \ No newline at end of file diff --git a/src/overlapping/spoilt_slice_selects.jl b/src/overlapping/gradient_pulses/spoilt_slice_selects.jl similarity index 92% rename from src/overlapping/spoilt_slice_selects.jl rename to src/overlapping/gradient_pulses/spoilt_slice_selects.jl index 2b0a684e6a24fe8fe2ab6cec2a888ab708cd27d6..9f6127b04b1ec91aa361382066fbc44247d617a4 100644 --- a/src/overlapping/spoilt_slice_selects.jl +++ b/src/overlapping/gradient_pulses/spoilt_slice_selects.jl @@ -3,11 +3,11 @@ module SpoiltSliceSelects import LinearAlgebra: norm import StaticArrays: SVector import JuMP: @variable, @constraint, @objective, objective_function -import ...BuildingBlocks: RFPulseBlock, set_simple_constraints! -import ...BuildSequences: global_model, global_scanner -import ...Variables: VariableType, variables, duration, rise_time, flat_time, effective_time, qvec, gradient_strength, slew_rate -import ...Gradients: ChangingGradientBlock, ConstantGradientBlock -import ..Abstract: interruptions, waveform, AbstractOverlapping +import ....BuildingBlocks: RFPulseBlock, set_simple_constraints! +import ....BuildSequences: global_model, global_scanner +import ....Variables: VariableType, variables, duration, rise_time, flat_time, effective_time, qvec, gradient_strength, slew_rate +import ....Gradients: ChangingGradientBlock, ConstantGradientBlock +import ...Abstract: interruptions, waveform, AbstractOverlapping """ diff --git a/src/overlapping/trapezoid_gradients.jl b/src/overlapping/gradient_pulses/trapezoid_gradients.jl similarity index 92% rename from src/overlapping/trapezoid_gradients.jl rename to src/overlapping/gradient_pulses/trapezoid_gradients.jl index d3b9d2c8cd2bd8ff4bbd03bf4fbbcb5c472976de..705eeebfdf6511b51a55aaba10f9fbfe3a5eea4a 100644 --- a/src/overlapping/trapezoid_gradients.jl +++ b/src/overlapping/gradient_pulses/trapezoid_gradients.jl @@ -6,11 +6,11 @@ module TrapezoidGradients import JuMP: @constraint, @variable, VariableRef, value import StaticArrays: SVector import LinearAlgebra: norm -import ...Variables: qvec, rise_time, flat_time, slew_rate, gradient_strength, variables, duration, δ, get_free_variable, VariableType, inverse_slice_thickness, inverse_bandwidth, effective_time -import ...BuildingBlocks: duration, set_simple_constraints!, RFPulseBlock, scanner_constraints! -import ...BuildSequences: global_model -import ...Gradients: ChangingGradientBlock, ConstantGradientBlock -import ..Abstract: interruptions, waveform, AbstractOverlapping +import ....Variables: qvec, rise_time, flat_time, slew_rate, gradient_strength, variables, duration, δ, get_free_variable, VariableType, inverse_slice_thickness, inverse_bandwidth, effective_time +import ....BuildingBlocks: duration, set_simple_constraints!, RFPulseBlock, scanner_constraints! +import ....BuildSequences: global_model +import ....Gradients: ChangingGradientBlock, ConstantGradientBlock +import ...Abstract: interruptions, waveform, AbstractOverlapping """ diff --git a/src/overlapping/overlapping.jl b/src/overlapping/overlapping.jl index 72fe36b6daf99629552aaed5e9b10dfe3c99ad0b..3b5a7be03c4ce22b8b92dcd3d0e11138adfdc643 100644 --- a/src/overlapping/overlapping.jl +++ b/src/overlapping/overlapping.jl @@ -1,12 +1,10 @@ module Overlapping include("abstract.jl") include("generic.jl") -include("trapezoid_gradients.jl") -include("spoilt_slice_selects.jl") +include("gradient_pulses//gradient_pulses.jl") import .Abstract: AbstractOverlapping, interruptions, waveform import .Generic: GenericOverlapping -import .TrapezoidGradients: TrapezoidGradient -import .SpoiltSliceSelects: SpoiltSliceSelect +import .GradientPulses: TrapezoidGradient, SpoiltSliceSelect end \ No newline at end of file