From 80ce6d61dc283d2b42b16a2c41546af08d9fd47f Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Thu, 25 Apr 2024 17:03:57 +0100
Subject: [PATCH] Rename `merge` to `merge_sequences`
Prevents conflict with `Base.merge`
---
src/MRIBuilder.jl | 4 ++--
src/post_hoc.jl | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/MRIBuilder.jl b/src/MRIBuilder.jl
index 0f84fa8..095c5c9 100644
--- a/src/MRIBuilder.jl
+++ b/src/MRIBuilder.jl
@@ -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
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
-export adjust, merge
+import .PostHoc: adjust, merge_sequences
+export adjust, merge_sequences
import .Sequences: GradientEcho, SpinEcho, DiffusionSpinEcho, DW_SE, DWI
export GradientEcho, SpinEcho, DiffusionSpinEcho, DW_SE, DWI
diff --git a/src/post_hoc.jl b/src/post_hoc.jl
index a5ec9eb..b6d1592 100644
--- a/src/post_hoc.jl
+++ b/src/post_hoc.jl
@@ -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.
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.)
wb = Wait(wait_time)
--
GitLab