From 20ed1a0af687de91d41cb0584afc1d2fad1d0d34 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Fri, 2 Feb 2024 16:59:15 +0000
Subject: [PATCH] Move spoilt/slice select pulses into separate folder

---
 src/overlapping/gradient_pulses/gradient_pulses.jl     |  8 ++++++++
 .../{ => gradient_pulses}/spoilt_slice_selects.jl      | 10 +++++-----
 .../{ => gradient_pulses}/trapezoid_gradients.jl       | 10 +++++-----
 src/overlapping/overlapping.jl                         |  6 ++----
 4 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 src/overlapping/gradient_pulses/gradient_pulses.jl
 rename src/overlapping/{ => gradient_pulses}/spoilt_slice_selects.jl (92%)
 rename src/overlapping/{ => gradient_pulses}/trapezoid_gradients.jl (92%)

diff --git a/src/overlapping/gradient_pulses/gradient_pulses.jl b/src/overlapping/gradient_pulses/gradient_pulses.jl
new file mode 100644
index 0000000..fcab143
--- /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 2b0a684..9f6127b 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 d3b9d2c..705eeeb 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 72fe36b..3b5a7be 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
-- 
GitLab