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

Fix creation of empty GenericOverlapping

parent cfe9c40a
No related branches found
No related tags found
No related merge requests found
module Generic module Generic
import ..Abstract: AbstractOverlapping, interruptions, duration, waveform_sequence import ..Abstract: AbstractOverlapping, interruptions, duration, waveform_sequence
import ...Variables: VariableType import ...Variables: VariableType, duration
import ...Wait: WaitBlock import ...Wait: WaitBlock
import ...Readouts: InstantReadout, ADC import ...Readouts: InstantReadout, ADC
import ...Pulses: RFPulseBlock import ...Pulses: RFPulseBlock
...@@ -21,7 +21,7 @@ struct GenericOverlapping <: AbstractOverlapping ...@@ -21,7 +21,7 @@ struct GenericOverlapping <: AbstractOverlapping
duration :: VariableType duration :: VariableType
waveform :: Vector{Union{WaitBlock, GradientBlock}} waveform :: Vector{Union{WaitBlock, GradientBlock}}
interruptions :: Vector{NamedTuple{(:index, :time, :object), Tuple{Int64, <:VariableType, <:Union{RFPulseBlock, InstantReadout, ADC}}}} interruptions :: Vector{NamedTuple{(:index, :time, :object), Tuple{Int64, <:VariableType, <:Union{RFPulseBlock, InstantReadout, ADC}}}}
function GenericOverlapping(duration::VariableType, waveform::AbstractVector{<:Union{WaitBlock, GradientBlock}}, interruptions::AbstractVector=[]) function GenericOverlapping(duration::VariableType, waveform::AbstractVector, interruptions::AbstractVector=[])
res = new(duration, waveform, interruptions) res = new(duration, waveform, interruptions)
scanner_constraints!.(waveform) scanner_constraints!.(waveform)
return res return res
...@@ -39,7 +39,8 @@ make_generic(ao::AbstractOverlapping) = GenericOverlapping( ...@@ -39,7 +39,8 @@ make_generic(ao::AbstractOverlapping) = GenericOverlapping(
waveform_sequence(go::GenericOverlapping) = go.waveform waveform_sequence(go::GenericOverlapping) = go.waveform
interruptions(go::GenericOverlapping) = go.interruptions interruptions(go::GenericOverlapping) = go.interruptions
duration(go::GenericOverlapping) = go.duration
make_generic(wait::WaitBlock) = GenericOverlapping(wait.duration, [], []) make_generic(wait::WaitBlock) = GenericOverlapping(duration(wait), [], [])
end end
\ No newline at end of file
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