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

Rename `merge` to `merge_sequences`

Prevents conflict with `Base.merge`
parent c2c06fc8
No related branches found
No related tags found
No related merge requests found
...@@ -37,8 +37,8 @@ export Pathway, duration_transverse, duration_dephase, bval, bmat, get_pathway ...@@ -37,8 +37,8 @@ export Pathway, duration_transverse, duration_dephase, bval, bmat, get_pathway
import .Parts: dwi_gradients, readout_event, excitation_pulse, refocus_pulse, Trapezoid, SliceSelect, LineReadout, opposite_kspace_lines, SpoiltSliceSelect, SliceSelectRephase, EPIReadout, interpret_image_size import .Parts: dwi_gradients, readout_event, excitation_pulse, refocus_pulse, Trapezoid, SliceSelect, LineReadout, opposite_kspace_lines, SpoiltSliceSelect, SliceSelectRephase, EPIReadout, interpret_image_size
export dwi_gradients, readout_event, excitation_pulse, refocus_pulse, Trapezoid, SliceSelect, LineReadout, opposite_kspace_lines, SpoiltSliceSelect, SliceSelectRephase, EPIReadout, interpret_image_size export dwi_gradients, readout_event, excitation_pulse, refocus_pulse, Trapezoid, SliceSelect, LineReadout, opposite_kspace_lines, SpoiltSliceSelect, SliceSelectRephase, EPIReadout, interpret_image_size
import .PostHoc: adjust, merge import .PostHoc: adjust, merge_sequences
export adjust, merge export adjust, merge_sequences
import .Sequences: GradientEcho, SpinEcho, DiffusionSpinEcho, DW_SE, DWI import .Sequences: GradientEcho, SpinEcho, DiffusionSpinEcho, DW_SE, DWI
export GradientEcho, SpinEcho, DiffusionSpinEcho, DW_SE, DWI export GradientEcho, SpinEcho, DiffusionSpinEcho, DW_SE, DWI
......
...@@ -70,15 +70,15 @@ adjust_helper(pair:: Pair, used_names::Set{Symbol}; kwargs...) = adjust_helper(p ...@@ -70,15 +70,15 @@ adjust_helper(pair:: Pair, used_names::Set{Symbol}; kwargs...) = adjust_helper(p
""" """
merge(sequences...; wait_time=0.) merge_sequences(sequences...; wait_time=0.)
Merge multiple sequences together. Merge multiple sequences together.
Sequences will be run one after each other with `wait_time` in between. Sequences will be run one after each other with `wait_time` in between.
""" """
merge(sequences::Sequence{S}...; kwargs...) where {S} = merge_internal(sequences...; name=S, kwargs...) merge_sequences(sequences::Sequence{S}...; kwargs...) where {S} = merge_internal(sequences...; name=S, kwargs...)
merge(sequences::Sequence...; kwargs...) = merge_internal(sequences...; kwargs...) merge_sequences(sequences::Sequence...; kwargs...) = merge_internal(sequences...; kwargs...)
function merge_internal(sequences...; name=:Sequence, wait_time=0.) function merge_internal(sequences...; name=:Sequence, wait_time=0.)
wb = Wait(wait_time) wb = Wait(wait_time)
......
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