From 86b9bc706565b50aa96cc55bc7f6fa77ff85a696 Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Fri, 2 Feb 2024 10:38:53 +0000
Subject: [PATCH] Fix location of scanner_constraints! definition
---
src/overlapping/generic.jl | 2 +-
src/overlapping/trapezoid_gradients.jl | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/overlapping/generic.jl b/src/overlapping/generic.jl
index 433437f..ce5f406 100644
--- a/src/overlapping/generic.jl
+++ b/src/overlapping/generic.jl
@@ -5,7 +5,7 @@ import ...Wait: WaitBlock
import ...Readouts: InstantReadout
import ...Pulses: RFPulseBlock
import ...Gradients: GradientBlock
-import ...Scanners: scanner_constraints!
+import ...BuildingBlocks: scanner_constraints!
"""
GenericWaveform(duration, waveform, interruptions)
diff --git a/src/overlapping/trapezoid_gradients.jl b/src/overlapping/trapezoid_gradients.jl
index 5f86100..9a2fd47 100644
--- a/src/overlapping/trapezoid_gradients.jl
+++ b/src/overlapping/trapezoid_gradients.jl
@@ -7,10 +7,9 @@ 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!, fixed, RFPulseBlock
+import ...BuildingBlocks: duration, set_simple_constraints!, fixed, RFPulseBlock, scanner_constraints!
import ...BuildSequences: global_model
import ...Gradients: ChangingGradientBlock, ConstantGradientBlock
-import ...Scanners: scanner_constraints!
import ..Abstract: interruptions, waveform, AbstractOverlapping
--
GitLab