From 466031351f845b8fc04a318c2053574a9616965a Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Thu, 15 Feb 2024 16:37:22 +0000
Subject: [PATCH] Ensure value is in scope
---
src/variables.jl | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/variables.jl b/src/variables.jl
index d10a4e2..bf9c844 100644
--- a/src/variables.jl
+++ b/src/variables.jl
@@ -12,7 +12,7 @@ In addition this defines:
- [`gradient_orientation`](@ref): returns the gradient orientation of a waveform if fixed.
"""
module Variables
-import JuMP: @constraint, @variable, Model, @objective, objective_function, value, AbstractJuMPScalar
+import JuMP: @constraint, @variable, Model, @objective, objective_function, AbstractJuMPScalar
import ..Scanners: gradient_strength, slew_rate, Scanner
import ..BuildSequences: global_model, global_scanner
@@ -330,14 +330,16 @@ function make_generic end
Constraints [`gradient_strength`](@ref) and [`slew_rate`](@ref) to be less than the [`global_scanner`](@ref) maximum.
"""
function scanner_constraints!(bb::AbstractBlock)
+ @show bb
try
global_scanner()
catch e
return
end
- for f in (gradient_strength, slew_rate)
+ for f in (slew_rate, gradient_strength)
+ value = nothing
try
- value = gradient_strength(bb)
+ value = f(bb)
catch e
if e isa VariableNotAvailable
continue
--
GitLab