Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MRIBuilder.jl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michiel Cottaar
MRIBuilder.jl
Commits
80ce6d61
Verified
Commit
80ce6d61
authored
11 months ago
by
Michiel Cottaar
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/MRIBuilder.jl
+2
-2
2 additions, 2 deletions
src/MRIBuilder.jl
src/post_hoc.jl
+3
-3
3 additions, 3 deletions
src/post_hoc.jl
with
5 additions
and
5 deletions
src/MRIBuilder.jl
+
2
−
2
View file @
80ce6d61
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/post_hoc.jl
+
3
−
3
View file @
80ce6d61
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment