Skip to content

Commit

Permalink
Merge pull request #321 from JuliaHealth/zero-concat
Browse files Browse the repository at this point in the history 
Incorrect gradient interpretation when waveforms do not end in zero
  • Loading branch information
@cncastillo
cncastillo authored Apr 8, 2024
2 parents 148a257 + 303e78c commit 3d7e92d
Show file tree
Hide file tree
Showing 40 changed files with 28,142 additions and 514 deletions.
52 changes: 33 additions & 19 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,52 +40,64 @@ jobs:
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRIBase: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
with:
project: KomaMRIBase
- name: "Run tests for KomaMRIBase"
if: always()
- name: "KomaMRIBase: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
project: KomaMRIBase
- name: "KomaMRICore dev setup"
- name: "KomaMRICore: Development Setup"
if: '!cancelled()'
shell: bash
run: |
julia --color=yes --project="KomaMRICore" -e "using Pkg; Pkg.develop(PackageSpec(; path=\"./KomaMRIBase\"));"
- uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRICore: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
with:
project: KomaMRICore
- name: "Run tests for KomaMRICore"
if: always()
- name: "KomaMRICore: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
project: KomaMRICore
- name: "KomaMRIFiles dev setup"
- name: "KomaMRIFiles: Development Setup"
if: '!cancelled()'
shell: bash
run: |
julia --color=yes --project="KomaMRIFiles" -e "using Pkg; Pkg.develop(PackageSpec(; path=\"./KomaMRIBase\"));"
- uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRIFiles: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
with:
project: KomaMRIFiles
- name: "Run tests for KomaMRIFiles"
if: always()
- name: "KomaMRIFiles: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
project: KomaMRIFiles
- name: "KomaMRIPlots dev setup"
- name: "KomaMRIPlots: Development Setup"
if: '!cancelled()'
shell: bash
run: |
julia --color=yes --project="KomaMRIPlots" -e "using Pkg; Pkg.develop(PackageSpec(; path=\"./KomaMRIBase\"));"
- uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRIPlots: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
with:
project: KomaMRIPlots
- name: "Run tests for KomaMRIPlots"
if: always()
- name: "KomaMRIPlots: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
project: KomaMRIPlots
prefix: ${{ matrix.prefix }} # for `xvfb-run`
- name: "KomaMRI dev setup"
- name: "KomaMRI: Development Setup"
if: '!cancelled()'
shell: julia --color=yes --project {0}
run: |
using Pkg
Expand All @@ -95,9 +107,11 @@ jobs:
PackageSpec(path=pwd(), subdir="KomaMRIFiles"),
PackageSpec(path=pwd(), subdir="KomaMRIPlots")
])
- uses: julia-actions/julia-buildpkg@v1
- name: "Run tests for KomaMRI"
if: always()
- name: "KomaMRI: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRI: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
prefix: ${{ matrix.prefix }} # for `xvfb-run`
Expand Down
47 changes: 33 additions & 14 deletions .github/workflows/nightly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,48 +39,64 @@ jobs:
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRIBase: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
with:
project: KomaMRIBase
- name: "Run tests for KomaMRIBase"
- name: "KomaMRIBase: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
project: KomaMRIBase
- name: "KomaMRICore dev setup"
- name: "KomaMRICore: Development Setup"
if: '!cancelled()'
shell: bash
run: |
julia --color=yes --project="KomaMRICore" -e "using Pkg; Pkg.develop(PackageSpec(; path=\"./KomaMRIBase\"));"
- uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRICore: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
with:
project: KomaMRICore
- name: "Run tests for KomaMRICore"
- name: "KomaMRICore: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
project: KomaMRICore
- name: "KomaMRIFiles dev setup"
- name: "KomaMRIFiles: Development Setup"
if: '!cancelled()'
shell: bash
run: |
julia --color=yes --project="KomaMRIFiles" -e "using Pkg; Pkg.develop(PackageSpec(; path=\"./KomaMRIBase\"));"
- uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRIFiles: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
with:
project: KomaMRIFiles
- name: "Run tests for KomaMRIFiles"
- name: "KomaMRIFiles: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
project: KomaMRIFiles
- name: "KomaMRIPlots dev setup"
- name: "KomaMRIPlots: Development Setup"
if: '!cancelled()'
shell: bash
run: |
julia --color=yes --project="KomaMRIPlots" -e "using Pkg; Pkg.develop(PackageSpec(; path=\"./KomaMRIBase\"));"
- uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRIPlots: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
with:
project: KomaMRIPlots
- name: "Run tests for KomaMRIPlots"
- name: "KomaMRIPlots: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
project: KomaMRIPlots
prefix: ${{ matrix.prefix }} # for `xvfb-run`
- name: "KomaMRI dev setup"
- name: "KomaMRI: Development Setup"
if: '!cancelled()'
shell: julia --color=yes --project {0}
run: |
using Pkg
Expand All @@ -90,8 +106,11 @@ jobs:
PackageSpec(path=pwd(), subdir="KomaMRIFiles"),
PackageSpec(path=pwd(), subdir="KomaMRIPlots")
])
- uses: julia-actions/julia-buildpkg@v1
- name: "Run tests for KomaMRI"
- name: "KomaMRI: Build"
if: '!cancelled()'
uses: julia-actions/julia-buildpkg@v1
- name: "KomaMRI: Run Tests"
if: '!cancelled()'
uses: julia-actions/julia-runtest@v1
with:
prefix: ${{ matrix.prefix }} # for `xvfb-run`
2 changes: 1 addition & 1 deletion KomaMRIBase/Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "KomaMRIBase"
uuid = "d0bc0b20-b151-4d03-b2a4-6ca51751cb9c"
authors = ["Carlos Castillo Passi <[email protected]>"]
version = "0.8.2"
version = "0.8.3"

[deps]
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
Expand Down
2 changes: 2 additions & 0 deletions KomaMRIBase/src/KomaMRIBase.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ export Grad, RF, ADC, Delay
export dur, get_block_start_times, get_samples
export DiscreteSequence
export discretize, get_adc_phase_compensation, get_adc_sampling_times
export is_Gx_on, is_Gy_on, is_Gz_on, is_RF_on, is_ADC_on
export time, ampl, freq
# This are also used for simulation
export kfoldperm, trapz, cumtrapz
# Phantom
Expand Down
Loading

0 comments on commit 3d7e92d

Please sign in to comment.