Skip to content
Snippets Groups Projects
Verified Commit 46603135 authored by Michiel Cottaar's avatar Michiel Cottaar
Browse files

Ensure value is in scope

parent 937e9fa1
No related branches found
No related tags found
No related merge requests found
...@@ -12,7 +12,7 @@ In addition this defines: ...@@ -12,7 +12,7 @@ In addition this defines:
- [`gradient_orientation`](@ref): returns the gradient orientation of a waveform if fixed. - [`gradient_orientation`](@ref): returns the gradient orientation of a waveform if fixed.
""" """
module Variables 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 ..Scanners: gradient_strength, slew_rate, Scanner
import ..BuildSequences: global_model, global_scanner import ..BuildSequences: global_model, global_scanner
...@@ -330,14 +330,16 @@ function make_generic end ...@@ -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. Constraints [`gradient_strength`](@ref) and [`slew_rate`](@ref) to be less than the [`global_scanner`](@ref) maximum.
""" """
function scanner_constraints!(bb::AbstractBlock) function scanner_constraints!(bb::AbstractBlock)
@show bb
try try
global_scanner() global_scanner()
catch e catch e
return return
end end
for f in (gradient_strength, slew_rate) for f in (slew_rate, gradient_strength)
value = nothing
try try
value = gradient_strength(bb) value = f(bb)
catch e catch e
if e isa VariableNotAvailable if e isa VariableNotAvailable
continue continue
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment